Skip to content

drop deprecated mao config #518

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

Merged
openshift-merge-robot merged 1 commit into from
Oct 29, 2018
Merged

drop deprecated mao config #518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions pkg/asset/ignition/bootstrap/bootstrap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ func (a *Bootstrap) Dependencies() []asset.Asset {
&tls.KubeCA{},
&tls.AggregatorCA{},
&tls.ServiceServingCA{},
&tls.ClusterAPIServerCertKey{},
&tls.EtcdClientCertKey{},
&tls.APIServerCertKey{},
&tls.OpenshiftAPIServerCertKey{},
Expand Down Expand Up @@ -253,7 +252,6 @@ func (a *Bootstrap) addTLSCertFiles(dependencies asset.Parents) {
&tls.AggregatorCA{},
&tls.ServiceServingCA{},
&tls.EtcdCA{},
&tls.ClusterAPIServerCertKey{},
&tls.EtcdClientCertKey{},
&tls.APIServerCertKey{},
&tls.OpenshiftAPIServerCertKey{},
Expand Down
23 changes: 0 additions & 23 deletions pkg/asset/manifests/content/bootkube/cluster-apiserver-certs.go
View file
Open in desktop

This file was deleted.

153 changes: 0 additions & 153 deletions pkg/asset/manifests/machine-api-operator.go
View file
Open in desktop

This file was deleted.

11 changes: 1 addition & 10 deletions pkg/asset/manifests/operators.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,12 @@ func (m *Manifests) Dependencies() []asset.Asset {
return []asset.Asset{
&installconfig.InstallConfig{},
&networkOperator{},
&machineAPIOperator{},
&tls.RootCA{},
&tls.EtcdCA{},
&tls.IngressCertKey{},
&tls.KubeCA{},
&tls.AggregatorCA{},
&tls.ServiceServingCA{},
&tls.ClusterAPIServerCertKey{},
&tls.EtcdClientCertKey{},
&tls.APIServerCertKey{},
&tls.OpenshiftAPIServerCertKey{},
Expand All @@ -69,15 +67,13 @@ func (m *Manifests) Dependencies() []asset.Asset {
// Generate generates the respective operator config.yml files
func (m *Manifests) Generate(dependencies asset.Parents) error {
no := &networkOperator{}
mao := &machineAPIOperator{}
installConfig := &installconfig.InstallConfig{}
dependencies.Get(no, mao, installConfig)
dependencies.Get(no, installConfig)

// no+mao go to kube-system config map
m.KubeSysConfig = configMap("kube-system", "cluster-config-v1", genericData{
"network-config": string(no.Files()[0].Data),
"install-config": string(installConfig.Files()[0].Data),
"mao-config": string(mao.Files()[0].Data),
})
kubeSysConfigData, err := yaml.Marshal(m.KubeSysConfig)
if err != nil {
Expand Down Expand Up @@ -105,7 +101,6 @@ func (m *Manifests) generateBootKubeManifests(dependencies asset.Parents) []*ass
aggregatorCA := &tls.AggregatorCA{}
apiServerCertKey := &tls.APIServerCertKey{}
apiServerProxyCertKey := &tls.APIServerProxyCertKey{}
clusterAPIServerCertKey := &tls.ClusterAPIServerCertKey{}
etcdCA := &tls.EtcdCA{}
etcdClientCertKey := &tls.EtcdClientCertKey{}
kubeCA := &tls.KubeCA{}
Expand All @@ -120,7 +115,6 @@ func (m *Manifests) generateBootKubeManifests(dependencies asset.Parents) []*ass
aggregatorCA,
apiServerCertKey,
apiServerProxyCertKey,
clusterAPIServerCertKey,
etcdCA,
etcdClientCertKey,
kubeCA,
Expand All @@ -145,8 +139,6 @@ func (m *Manifests) generateBootKubeManifests(dependencies asset.Parents) []*ass
ApiserverProxyCert: base64.StdEncoding.EncodeToString(apiServerProxyCertKey.Cert()),
ApiserverProxyKey: base64.StdEncoding.EncodeToString(apiServerProxyCertKey.Key()),
Base64encodeCloudProviderConfig: "", // FIXME
ClusterapiCaCert: base64.StdEncoding.EncodeToString(clusterAPIServerCertKey.Cert()),
ClusterapiCaKey: base64.StdEncoding.EncodeToString(clusterAPIServerCertKey.Key()),
EtcdCaCert: base64.StdEncoding.EncodeToString(etcdCA.Cert()),
EtcdClientCert: base64.StdEncoding.EncodeToString(etcdClientCertKey.Cert()),
EtcdClientKey: base64.StdEncoding.EncodeToString(etcdClientCertKey.Key()),
Expand All @@ -171,7 +163,6 @@ func (m *Manifests) generateBootKubeManifests(dependencies asset.Parents) []*ass
}

assetData := map[string][]byte{
"cluster-apiserver-certs.yaml": applyTemplateData(bootkube.ClusterApiserverCerts, 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),
Expand Down
2 changes: 0 additions & 2 deletions pkg/asset/manifests/template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ type bootkubeTemplateData struct {
ApiserverProxyCert string
ApiserverProxyKey string
Base64encodeCloudProviderConfig string
ClusterapiCaCert string
ClusterapiCaKey string
EtcdCaCert string
EtcdClientCert string
EtcdClientKey string
Expand Down
44 changes: 0 additions & 44 deletions pkg/asset/tls/clusterapiservercertkey.go
View file
Open in desktop

This file was deleted.