Skip to content

Remove cvo overrides #799

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
rajatchopra wants to merge 2 commits into from
Closed

Remove cvo overrides #799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b80f0e9
data/data/manifests/bootkube: remove the legacy cvo overrides templat…
Dec 5, 2018
685e42d
pkg/asset: remove cvo overrides
Dec 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions data/data/manifests/bootkube/cvo-overrides.yaml.template
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions data/data/manifests/bootkube/legacy-cvo-overrides.yaml.template
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions pkg/asset/manifests/operators.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ func (m *Manifests) Dependencies() []asset.Asset {
&bootkube.MachineConfigServerTLSSecret{},
&bootkube.OpenshiftServiceCertSignerSecret{},
&bootkube.Pull{},
&bootkube.CVOOverrides{},
&bootkube.HostEtcdServiceEndpointsKubeSystem{},
&bootkube.KubeSystemConfigmapEtcdServingCA{},
&bootkube.KubeSystemConfigmapRootCA{},
Expand Down Expand Up @@ -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,
}
Expand All @@ -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{}
Expand All @@ -180,7 +177,6 @@ func (m *Manifests) generateBootKubeManifests(dependencies asset.Parents) []*ass
machineConfigServerTLSSecret,
openshiftServiceCertSignerSecret,
pull,
cVOOverrides,
hostEtcdServiceEndpointsKubeSystem,
kubeSystemConfigmapEtcdServingCA,
kubeSystemConfigmapRootCA,
Expand All @@ -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),
Expand Down
1 change: 0 additions & 1 deletion pkg/asset/manifests/template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ type bootkubeTemplateData struct {
ServiceServingCaCert string
ServiceServingCaKey string
WorkerIgnConfig string
CVOClusterID string
EtcdEndpointHostnames []string
EtcdEndpointDNSSuffix string
}
Expand Down
68 changes: 0 additions & 68 deletions pkg/asset/templates/content/bootkube/cvo-overrides.go
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions pkg/asset/templates/templates.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ func (m *Templates) Dependencies() []asset.Asset {
&bootkube.MachineConfigServerTLSSecret{},
&bootkube.OpenshiftServiceCertSignerSecret{},
&bootkube.Pull{},
&bootkube.CVOOverrides{},
&bootkube.HostEtcdServiceEndpointsKubeSystem{},
&bootkube.KubeSystemConfigmapEtcdServingCA{},
&bootkube.KubeSystemConfigmapRootCA{},
Expand All @@ -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{}
Expand All @@ -73,7 +71,6 @@ func (m *Templates) Generate(dependencies asset.Parents) error {
machineConfigServerTLSSecret,
openshiftServiceCertSignerSecret,
pull,
cVOOverrides,
hostEtcdServiceEndpointsKubeSystem,
kubeSystemConfigmapEtcdServingCA,
kubeSystemConfigmapRootCA,
Expand All @@ -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()...)
Expand Down