diff --git a/pkg/asset/manifests/content/bootkube/ign-config.go b/pkg/asset/manifests/content/bootkube/ign-config.go deleted file mode 100644 index 1222a9d40d0..00000000000 --- a/pkg/asset/manifests/content/bootkube/ign-config.go +++ /dev/null @@ -1,19 +0,0 @@ -package bootkube - -import ( - "text/template" -) - -var ( - // IgnConfig is the constant to represent contents of ign_config.yaml file - IgnConfig = template.Must(template.New("ign-config.yaml").Parse(` -apiVersion: v1 -kind: Secret -metadata: - name: ignition-worker - namespace: openshift-cluster-api -type: Opaque -data: - userData: {{.WorkerIgnConfig}} -`)) -) diff --git a/pkg/asset/manifests/operators.go b/pkg/asset/manifests/operators.go index eb9b8cc9201..d5ef9848824 100644 --- a/pkg/asset/manifests/operators.go +++ b/pkg/asset/manifests/operators.go @@ -12,7 +12,6 @@ import ( "github.com/pkg/errors" "github.com/openshift/installer/pkg/asset" - "github.com/openshift/installer/pkg/asset/ignition/machine" "github.com/openshift/installer/pkg/asset/installconfig" "github.com/openshift/installer/pkg/asset/kubeconfig" "github.com/openshift/installer/pkg/asset/manifests/content/bootkube" @@ -64,7 +63,6 @@ func (m *Manifests) Dependencies() []asset.Asset { &tls.KubeletCertKey{}, &tls.ServiceAccountKeyPair{}, &kubeconfig.Admin{}, - &machine.Worker{}, } } @@ -117,7 +115,6 @@ func (m *Manifests) generateBootKubeManifests(dependencies asset.Parents) []*ass rootCA := &tls.RootCA{} serviceAccountKeyPair := &tls.ServiceAccountKeyPair{} serviceServingCA := &tls.ServiceServingCA{} - workerIgnition := &machine.Worker{} dependencies.Get( installConfig, aggregatorCA, @@ -133,7 +130,6 @@ func (m *Manifests) generateBootKubeManifests(dependencies asset.Parents) []*ass rootCA, serviceAccountKeyPair, serviceServingCA, - workerIgnition, ) etcdEndpointHostnames := make([]string, installConfig.Config.MasterCount()) @@ -169,7 +165,6 @@ func (m *Manifests) generateBootKubeManifests(dependencies asset.Parents) []*ass ServiceServingCaCert: base64.StdEncoding.EncodeToString(serviceServingCA.Cert()), ServiceServingCaKey: base64.StdEncoding.EncodeToString(serviceServingCA.Key()), TectonicNetworkOperatorImage: "quay.io/coreos/tectonic-network-operator-dev:375423a332f2c12b79438fc6a6da6e448e28ec0f", - WorkerIgnConfig: base64.StdEncoding.EncodeToString(workerIgnition.Files()[0].Data), CVOClusterID: installConfig.Config.ClusterID, EtcdEndpointHostnames: etcdEndpointHostnames, EtcdEndpointDNSSuffix: installConfig.Config.BaseDomain, @@ -177,7 +172,6 @@ func (m *Manifests) generateBootKubeManifests(dependencies asset.Parents) []*ass assetData := map[string][]byte{ "cluster-apiserver-certs.yaml": applyTemplateData(bootkube.ClusterApiserverCerts, templateData), - "ign-config.yaml": applyTemplateData(bootkube.IgnConfig, templateData), "kube-apiserver-secret.yaml": applyTemplateData(bootkube.KubeApiserverSecret, templateData), "kube-cloud-config.yaml": applyTemplateData(bootkube.KubeCloudConfig, templateData), "kube-controller-manager-secret.yaml": applyTemplateData(bootkube.KubeControllerManagerSecret, templateData),