*: Drop the Tectonic license

.gitignore

@@ -9,7 +9,6 @@ id_rsa*
 pull-secret.json
 ssh-key.pem
 tectonic-*.tar.gz
-tectonic-license.txt
 config.yaml
 
 bin/

Documentation/design/installconfig.md

@@ -53,9 +53,6 @@ type InstallConfig struct {
     // perform the installation.
     Platform `json:"platform"`
 
-    // License is an OpenShift license needed to install a cluster.
-    License string `json:"license"`
-
     // PullSecret is the secret to use when pulling images.
     PullSecret string `json:"pullSecret"`
 }

Documentation/design/resource_dep.dot

@@ -18,7 +18,6 @@ strict digraph resource {
     node [shape=rectangle,style=filled,color=gainsboro];
     base_domain [label="base domain"];
     cluster_name [label="cluster name"];
-    license [label="license"];
     pull_secret [label="pull secret"];
     platform [label="platform"];
     email_address [label="email address"];
@@ -93,7 +92,6 @@ strict digraph resource {
   platform -> install_config;
   email_address -> install_config;
   pull_secret -> install_config;
-  license -> install_config;
   cluster_name -> install_config;
   base_domain -> install_config;
 

Documentation/dev/libvirt-howto.md

@@ -40,8 +40,8 @@ Because of the greater disk requirements of OpenShift, you'll need to expand the
 qemu-img resize coreos_production_qemu_image.img +8G
 ```
 
-#### 1.4 Get a Tectonic License
-Go to https://account.coreos.com/ and obtain a Tectonic license. Save the *pull secret* and *license path* somewhere.
+#### 1.4 Get a pull secret
+Go to https://account.coreos.com/ and obtain a Tectonic *pull secret*.
 
 #### 1.5 Make sure you have permisions for `qemu:///system`
 You may want to grant yourself permissions to use libvirt as a non-root user. You could allow all users in the wheel group by doing the following:
@@ -62,7 +62,6 @@ EOF
     1. Set a `baseDomain` (to `tt.testing`)
     1. Set the `sshKey` in the `admin` section to the **contents** of an ssh key (e.g. `ssh-rsa AAAA...`)
     1. Set the `imagePath` to the **absolute** path of the operating system image you downloaded
-    1. Set the `licensePath` to the **absolute** path of your downloaded license file.
     1. Set the `name` (e.g. test1)
     1. Look at the `podCIDR` and `serviceCIDR` fields in the `networking` section. Make sure they don't conflict with anything important.
     1. Set the `pullSecretPath` to the **absolute** path of your downloaded pull secret file.

Jenkinsfile

@@ -1,7 +1,6 @@
 #!/usr/bin/env groovy
 
 commonCreds = [
-  file(credentialsId: 'tectonic-license', variable: 'LICENSE_PATH'),
   file(credentialsId: 'tectonic-pull', variable: 'PULL_SECRET_PATH'),
   [
     $class: 'StringBinding',

cmd/openshift-install/BUILD.bazel

@@ -0,0 +1,20 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
+
+go_library(
+    name = "go_default_library",
+    srcs = ["main.go"],
+    importpath = "github.com/openshift/installer/cmd/openshift-install",
+    visibility = ["//visibility:private"],
+    deps = [
+        "//pkg/asset:go_default_library",
+        "//pkg/asset/stock:go_default_library",
+        "//vendor/github.com/Sirupsen/logrus:go_default_library",
+        "//vendor/gopkg.in/alecthomas/kingpin.v2:go_default_library",
+    ],
+)
+
+go_binary(
+    name = "openshift-install",
+    embed = [":go_default_library"],
+    visibility = ["//visibility:public"],
+)

config.tf

@@ -59,18 +59,18 @@ variable "tectonic_container_images" {
   default = {
     addon_resizer                        = "gcr.io/google_containers/addon-resizer:2.1"
     bootkube                             = "quay.io/coreos/bootkube:v0.10.0"
-    tnc_operator                         = "quay.io/coreos/tectonic-node-controller-operator-dev:c56e9aa2ea01bb7bf638e56c5c43f1ae6740b23a"
+    tnc_operator                         = "quay.io/coreos/tectonic-node-controller-operator-dev:436b1b4395ae54d866edc88864c9b01797cebac1"
     etcd_cert_signer                     = "quay.io/coreos/kube-etcd-signer-server:678cc8e6841e2121ebfdb6e2db568fce290b67d6"
     etcd                                 = "quay.io/coreos/etcd:v3.2.14"
     hyperkube                            = "openshift/origin-node:latest"
-    kube_core_renderer                   = "quay.io/coreos/kube-core-renderer-dev:c56e9aa2ea01bb7bf638e56c5c43f1ae6740b23a"
-    kube_core_operator                   = "quay.io/coreos/kube-core-operator-dev:c56e9aa2ea01bb7bf638e56c5c43f1ae6740b23a"
-    tectonic_channel_operator            = "quay.io/coreos/tectonic-channel-operator-dev:c56e9aa2ea01bb7bf638e56c5c43f1ae6740b23a"
-    kube_addon_operator                  = "quay.io/coreos/kube-addon-operator-dev:c56e9aa2ea01bb7bf638e56c5c43f1ae6740b23a"
+    kube_core_renderer                   = "quay.io/coreos/kube-core-renderer-dev:436b1b4395ae54d866edc88864c9b01797cebac1"
+    kube_core_operator                   = "quay.io/coreos/kube-core-operator-dev:436b1b4395ae54d866edc88864c9b01797cebac1"
+    tectonic_channel_operator            = "quay.io/coreos/tectonic-channel-operator-dev:436b1b4395ae54d866edc88864c9b01797cebac1"
+    kube_addon_operator                  = "quay.io/coreos/kube-addon-operator-dev:436b1b4395ae54d866edc88864c9b01797cebac1"
     tectonic_alm_operator                = "quay.io/coreos/tectonic-alm-operator:v0.3.1"
-    tectonic_ingress_controller_operator = "quay.io/coreos/tectonic-ingress-controller-operator-dev:c56e9aa2ea01bb7bf638e56c5c43f1ae6740b23a"
-    tectonic_utility_operator            = "quay.io/coreos/tectonic-utility-operator-dev:c56e9aa2ea01bb7bf638e56c5c43f1ae6740b23a"
-    tectonic_network_operator            = "quay.io/coreos/tectonic-network-operator-dev:c56e9aa2ea01bb7bf638e56c5c43f1ae6740b23a"
+    tectonic_ingress_controller_operator = "quay.io/coreos/tectonic-ingress-controller-operator-dev:436b1b4395ae54d866edc88864c9b01797cebac1"
+    tectonic_utility_operator            = "quay.io/coreos/tectonic-utility-operator-dev:436b1b4395ae54d866edc88864c9b01797cebac1"
+    tectonic_network_operator            = "quay.io/coreos/tectonic-network-operator-dev:436b1b4395ae54d866edc88864c9b01797cebac1"
   }
 }
 
@@ -192,18 +192,6 @@ You can download the pull secret from your Account overview page at [3].
 EOF
 }
 
-variable "tectonic_license_path" {
-  type    = "string"
-  default = ""
-
-  description = <<EOF
-The path to the tectonic licence file.
-You can download the Tectonic license file from your Account overview page at [1].
-
-[1] https://account.coreos.com/overview
-EOF
-}
-
 variable "tectonic_container_linux_channel" {
   type = "string"
 
@@ -305,12 +293,6 @@ This field is mandatory if `tectonic_ca_cert` is set.
 EOF
 }
 
-variable "tectonic_stats_url" {
-  type        = "string"
-  default     = "https://stats-collector.tectonic.com"
-  description = "(internal) The Tectonic statistics collection URL to which to report."
-}
-
 variable "tectonic_networking" {
   description = <<EOF
 (optional) Configures the network to be used in Tectonic. One of the following values can be used:

examples/tectonic.aws.yaml

@@ -182,12 +182,6 @@ iscsi:
   # (optional) Start iscsid.service to enable iscsi volume attachment.
   # enabled: false
 
-# The path to the tectonic licence file.
-# You can download the Tectonic license file from your Account overview page at [1].
-#
-# [1] https://account.coreos.com/overview
-licensePath:
-
 master:
   # The name of the node pool(s) to use for master nodes
   nodePools:

examples/tectonic.libvirt.yaml

@@ -51,12 +51,6 @@ iscsi:
   # (optional) Start iscsid.service to enable iscsi volume attachment.
   # enabled: false
 
-# The path to the tectonic licence file.
-# You can download the Tectonic license file from your Account overview page at [1].
-#
-# [1] https://account.coreos.com/overview
-licensePath:
-
 master:
   nodePools:
     - master

glide.yaml

@@ -20,3 +20,8 @@ import:
   version: v0.26.0
 - package: github.com/vincent-petithory/dataurl
   version: 9a301d65acbb728fcc3ace14f45f511a4cfeea9c
+testImport:
+- package: github.com/stretchr/testify
+  version: ^1.2.2
+  subpackages:
+  - assert

installer/pkg/config-generator/fixtures/test-aws.yaml

@@ -13,7 +13,6 @@ worker:
   nodePools:
     - worker
 pullSecretPath: /path/config.json
-licensePath: /path/tectonic-license.txt
 containerLinux:
   channel: stable
   version: latest

installer/pkg/config-generator/generator.go

@@ -28,7 +28,6 @@ const (
 	networkConfigAdvertiseAddress = "0.0.0.0"
 	identityConfigConsoleClientID = "tectonic-console"
 	identityConfigKubectlClientID = "tectonic-kubectl"
-	statsEmitterConfigStatsURL    = "https://stats-collector.tectonic.com"
 	ingressConfigIngressKind      = "haproxy-router"
 	certificatesStrategy          = "userProvidedCA"
 	identityAPIService            = "tectonic-identity-api.tectonic-system.svc.cluster.local"
@@ -218,8 +217,6 @@ func (c *ConfigGenerator) utilityConfig() (*tectonicutility.OperatorConfig, erro
 		},
 	}
 
-	utilityConfig.StatsEmitterConfig.StatsURL = statsEmitterConfigStatsURL
-
 	utilityConfig.TectonicConfigMapConfig.CertificatesStrategy = certificatesStrategy
 	utilityConfig.TectonicConfigMapConfig.ClusterID = c.Cluster.Internal.ClusterID
 	utilityConfig.TectonicConfigMapConfig.ClusterName = c.Cluster.Name

installer/pkg/config/cluster.go

@@ -83,7 +83,6 @@ type Cluster struct {
 	IgnitionWorker  string   `json:"tectonic_ignition_worker,omitempty" yaml:"-"`
 	Internal        `json:",inline" yaml:"-"`
 	libvirt.Libvirt `json:",inline" yaml:"libvirt,omitempty"`
-	LicensePath     string `json:"tectonic_license_path,omitempty" yaml:"licensePath,omitempty"`
 	Master          `json:",inline" yaml:"master,omitempty"`
 	Name            string `json:"tectonic_cluster_name,omitempty" yaml:"name,omitempty"`
 	Networking      `json:",inline" yaml:"networking,omitempty"`

installer/pkg/config/validate.go

@@ -285,9 +285,6 @@ func (c *Cluster) validateTectonicFiles() []error {
 	if err := validate.JSONFile(c.PullSecretPath); err != nil {
 		errs = append(errs, err)
 	}
-	if err := validate.License(c.LicensePath); err != nil {
-		errs = append(errs, err)
-	}
 	return errs
 }
 

installer/pkg/validate/BUILD.bazel

@@ -5,10 +5,7 @@ go_test(
     size = "small",
     srcs = ["validate_test.go"],
     embed = [":go_default_library"],
-    deps = [
-        "//pkg/asset/tls:go_default_library",
-        "//vendor/gopkg.in/square/go-jose.v2:go_default_library",
-    ],
+    deps = ["//pkg/asset/tls:go_default_library"],
 )
 
 go_library(
@@ -17,5 +14,4 @@ go_library(
     data = glob(["fixtures/**"]),
     importpath = "github.com/openshift/installer/installer/pkg/validate",
     visibility = ["//visibility:public"],
-    deps = ["//vendor/github.com/dgrijalva/jwt-go:go_default_library"],
 )

installer/pkg/validate/validate.go

@@ -13,10 +13,7 @@ import (
 	"regexp"
 	"strconv"
 	"strings"
-	"time"
 	"unicode/utf8"
-
-	"github.com/dgrijalva/jwt-go"
 )
 
 func isMatch(re string, v string) bool {
@@ -50,25 +47,6 @@ func FileExists(path string) error {
 	return err
 }
 
-// License validates that the file at the given path is a valid license.
-func License(path string) error {
-	licenseBytes, err := ioutil.ReadFile(path)
-	if err != nil {
-		return fmt.Errorf("cannot read license file at %q: %v", path, err)
-	}
-	c := struct {
-		ExpirationDate time.Time `json:"expirationDate"`
-		jwt.StandardClaims
-	}{}
-	if _, _, err := (&jwt.Parser{}).ParseUnverified(string(licenseBytes), &c); err != nil {
-		return fmt.Errorf("invalid JWT in license: %v; %q", err, string(licenseBytes))
-	}
-	if time.Now().After(c.ExpirationDate) {
-		return fmt.Errorf("expired license %v", c.ExpirationDate)
-	}
-	return nil
-}
-
 // NonEmpty checks if the given string contains at least one non-whitespace character and returns an error if not.
 func NonEmpty(v string) error {
 	if utf8.RuneCountInString(strings.TrimSpace(v)) == 0 {