diff --git a/data/data/manifests/bootkube/cvo-overrides.yaml.template b/data/data/manifests/bootkube/cvo-overrides.yaml.template deleted file mode 100644 index a798ade5d4b..00000000000 --- a/data/data/manifests/bootkube/cvo-overrides.yaml.template +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: config.openshift.io/v1 -kind: ClusterVersion -metadata: - namespace: openshift-cluster-version - name: version -spec: - upstream: http://localhost:8080/graph - channel: fast - clusterID: {{.CVOClusterID}} - overrides: - - kind: APIService # packages.apps.redhat.com fails to start properly - name: v1alpha1.packages.apps.redhat.com - unmanaged: true diff --git a/data/data/manifests/bootkube/legacy-cvo-overrides.yaml.template b/data/data/manifests/bootkube/legacy-cvo-overrides.yaml.template deleted file mode 100644 index 9c1e7a06512..00000000000 --- a/data/data/manifests/bootkube/legacy-cvo-overrides.yaml.template +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: clusterversion.openshift.io/v1 -kind: CVOConfig -metadata: - namespace: openshift-cluster-version - name: cluster-version-operator -upstream: http://localhost:8080/graph -channel: fast -clusterID: {{.CVOClusterID}} -overrides: -- kind: APIService # packages.apps.redhat.com fails to start properly - name: v1alpha1.packages.apps.redhat.com - unmanaged: true diff --git a/pkg/asset/manifests/operators.go b/pkg/asset/manifests/operators.go index e422d10fe24..1d46e8af8fd 100644 --- a/pkg/asset/manifests/operators.go +++ b/pkg/asset/manifests/operators.go @@ -68,7 +68,6 @@ func (m *Manifests) Dependencies() []asset.Asset { &bootkube.MachineConfigServerTLSSecret{}, &bootkube.OpenshiftServiceCertSignerSecret{}, &bootkube.Pull{}, - &bootkube.CVOOverrides{}, &bootkube.HostEtcdServiceEndpointsKubeSystem{}, &bootkube.KubeSystemConfigmapEtcdServingCA{}, &bootkube.KubeSystemConfigmapRootCA{}, @@ -154,7 +153,6 @@ func (m *Manifests) generateBootKubeManifests(dependencies asset.Parents) []*ass RootCaCert: string(rootCA.Cert()), ServiceServingCaCert: base64.StdEncoding.EncodeToString(serviceServingCA.Cert()), ServiceServingCaKey: base64.StdEncoding.EncodeToString(serviceServingCA.Key()), - CVOClusterID: installConfig.Config.ClusterID, EtcdEndpointHostnames: etcdEndpointHostnames, EtcdEndpointDNSSuffix: installConfig.Config.BaseDomain, } @@ -163,7 +161,6 @@ func (m *Manifests) generateBootKubeManifests(dependencies asset.Parents) []*ass machineConfigServerTLSSecret := &bootkube.MachineConfigServerTLSSecret{} openshiftServiceCertSignerSecret := &bootkube.OpenshiftServiceCertSignerSecret{} pull := &bootkube.Pull{} - cVOOverrides := &bootkube.CVOOverrides{} hostEtcdServiceEndpointsKubeSystem := &bootkube.HostEtcdServiceEndpointsKubeSystem{} kubeSystemConfigmapEtcdServingCA := &bootkube.KubeSystemConfigmapEtcdServingCA{} kubeSystemConfigmapRootCA := &bootkube.KubeSystemConfigmapRootCA{} @@ -180,7 +177,6 @@ func (m *Manifests) generateBootKubeManifests(dependencies asset.Parents) []*ass machineConfigServerTLSSecret, openshiftServiceCertSignerSecret, pull, - cVOOverrides, hostEtcdServiceEndpointsKubeSystem, kubeSystemConfigmapEtcdServingCA, kubeSystemConfigmapRootCA, @@ -197,7 +193,6 @@ func (m *Manifests) generateBootKubeManifests(dependencies asset.Parents) []*ass "machine-config-server-tls-secret.yaml": applyTemplateData(machineConfigServerTLSSecret.Files()[0].Data, templateData), "openshift-service-signer-secret.yaml": applyTemplateData(openshiftServiceCertSignerSecret.Files()[0].Data, templateData), "pull.json": applyTemplateData(pull.Files()[0].Data, templateData), - "cvo-overrides.yaml": applyTemplateData(cVOOverrides.Files()[0].Data, templateData), "host-etcd-service-endpoints.yaml": applyTemplateData(hostEtcdServiceEndpointsKubeSystem.Files()[0].Data, templateData), "kube-system-configmap-etcd-serving-ca.yaml": applyTemplateData(kubeSystemConfigmapEtcdServingCA.Files()[0].Data, templateData), "kube-system-configmap-root-ca.yaml": applyTemplateData(kubeSystemConfigmapRootCA.Files()[0].Data, templateData), diff --git a/pkg/asset/manifests/template.go b/pkg/asset/manifests/template.go index f341ad972d6..233f8fff2c0 100644 --- a/pkg/asset/manifests/template.go +++ b/pkg/asset/manifests/template.go @@ -30,7 +30,6 @@ type bootkubeTemplateData struct { ServiceServingCaCert string ServiceServingCaKey string WorkerIgnConfig string - CVOClusterID string EtcdEndpointHostnames []string EtcdEndpointDNSSuffix string } diff --git a/pkg/asset/templates/content/bootkube/cvo-overrides.go b/pkg/asset/templates/content/bootkube/cvo-overrides.go deleted file mode 100644 index f331ba39032..00000000000 --- a/pkg/asset/templates/content/bootkube/cvo-overrides.go +++ /dev/null @@ -1,68 +0,0 @@ -package bootkube - -import ( - "os" - "path/filepath" - - "github.com/openshift/installer/pkg/asset" - "github.com/openshift/installer/pkg/asset/templates/content" -) - -const ( - cVOOverridesFileName = "cvo-overrides.yaml.template" -) - -var _ asset.WritableAsset = (*CVOOverrides)(nil) - -// CVOOverrides is an asset that generates the cvo-override.yaml.template file. -// This is a gate to prevent CVO from installing these operators which conflict -// with resources already owned by other operators. -// This files can be dropped when the overrides list becomes empty. -type CVOOverrides struct { - fileName string - FileList []*asset.File -} - -// Dependencies returns all of the dependencies directly needed by the asset -func (t *CVOOverrides) Dependencies() []asset.Asset { - return []asset.Asset{} -} - -// Name returns the human-friendly name of the asset. -func (t *CVOOverrides) Name() string { - return "CVOOverrides" -} - -// Generate generates the actual files by this asset -func (t *CVOOverrides) Generate(parents asset.Parents) error { - t.fileName = cVOOverridesFileName - data, err := content.GetBootkubeTemplate(t.fileName) - if err != nil { - return err - } - t.FileList = []*asset.File{ - { - Filename: filepath.Join(content.TemplateDir, t.fileName), - Data: []byte(data), - }, - } - return nil -} - -// Files returns the files generated by the asset. -func (t *CVOOverrides) Files() []*asset.File { - return t.FileList -} - -// Load returns the asset from disk. -func (t *CVOOverrides) Load(f asset.FileFetcher) (bool, error) { - file, err := f.FetchByName(filepath.Join(content.TemplateDir, cVOOverridesFileName)) - if err != nil { - if os.IsNotExist(err) { - return false, nil - } - return false, err - } - t.FileList = []*asset.File{file} - return true, nil -} diff --git a/pkg/asset/templates/templates.go b/pkg/asset/templates/templates.go index 27a4f664416..47e434d67e8 100644 --- a/pkg/asset/templates/templates.go +++ b/pkg/asset/templates/templates.go @@ -27,7 +27,6 @@ func (m *Templates) Dependencies() []asset.Asset { &bootkube.MachineConfigServerTLSSecret{}, &bootkube.OpenshiftServiceCertSignerSecret{}, &bootkube.Pull{}, - &bootkube.CVOOverrides{}, &bootkube.HostEtcdServiceEndpointsKubeSystem{}, &bootkube.KubeSystemConfigmapEtcdServingCA{}, &bootkube.KubeSystemConfigmapRootCA{}, @@ -51,7 +50,6 @@ func (m *Templates) Generate(dependencies asset.Parents) error { machineConfigServerTLSSecret := &bootkube.MachineConfigServerTLSSecret{} openshiftServiceCertSignerSecret := &bootkube.OpenshiftServiceCertSignerSecret{} pull := &bootkube.Pull{} - cVOOverrides := &bootkube.CVOOverrides{} hostEtcdServiceEndpointsKubeSystem := &bootkube.HostEtcdServiceEndpointsKubeSystem{} kubeSystemConfigmapEtcdServingCA := &bootkube.KubeSystemConfigmapEtcdServingCA{} kubeSystemConfigmapRootCA := &bootkube.KubeSystemConfigmapRootCA{} @@ -73,7 +71,6 @@ func (m *Templates) Generate(dependencies asset.Parents) error { machineConfigServerTLSSecret, openshiftServiceCertSignerSecret, pull, - cVOOverrides, hostEtcdServiceEndpointsKubeSystem, kubeSystemConfigmapEtcdServingCA, kubeSystemConfigmapRootCA, @@ -94,7 +91,6 @@ func (m *Templates) Generate(dependencies asset.Parents) error { m.FileList = append(m.FileList, machineConfigServerTLSSecret.Files()...) m.FileList = append(m.FileList, openshiftServiceCertSignerSecret.Files()...) m.FileList = append(m.FileList, pull.Files()...) - m.FileList = append(m.FileList, cVOOverrides.Files()...) m.FileList = append(m.FileList, hostEtcdServiceEndpointsKubeSystem.Files()...) m.FileList = append(m.FileList, kubeSystemConfigmapEtcdServingCA.Files()...) m.FileList = append(m.FileList, kubeSystemConfigmapRootCA.Files()...)