From 086bd2c7a5ad1d0fa35f699e539d840bf3b1065c Mon Sep 17 00:00:00 2001 From: Abhinav Dahiya Date: Tue, 12 Feb 2019 09:48:35 -0800 Subject: [PATCH] asset/manifests: remove un-used deps --- pkg/asset/manifests/operators.go | 5 ----- pkg/asset/manifests/template.go | 2 -- 2 files changed, 7 deletions(-) diff --git a/pkg/asset/manifests/operators.go b/pkg/asset/manifests/operators.go index fffec10337c..162431d61ac 100644 --- a/pkg/asset/manifests/operators.go +++ b/pkg/asset/manifests/operators.go @@ -60,7 +60,6 @@ func (m *Manifests) Dependencies() []asset.Asset { &Networking{}, &tls.RootCA{}, &tls.EtcdCA{}, - &tls.KubeCA{}, &tls.EtcdClientCertKey{}, &tls.MCSCertKey{}, &tls.KubeletCertKey{}, @@ -125,7 +124,6 @@ func (m *Manifests) generateBootKubeManifests(dependencies asset.Parents) []*ass clusterID := &installconfig.ClusterID{} installConfig := &installconfig.InstallConfig{} etcdCA := &tls.EtcdCA{} - kubeCA := &tls.KubeCA{} mcsCertKey := &tls.MCSCertKey{} etcdClientCertKey := &tls.EtcdClientCertKey{} rootCA := &tls.RootCA{} @@ -134,7 +132,6 @@ func (m *Manifests) generateBootKubeManifests(dependencies asset.Parents) []*ass installConfig, etcdCA, etcdClientCertKey, - kubeCA, mcsCertKey, rootCA, ) @@ -149,8 +146,6 @@ func (m *Manifests) generateBootKubeManifests(dependencies asset.Parents) []*ass EtcdCaCert: string(etcdCA.Cert()), EtcdClientCert: base64.StdEncoding.EncodeToString(etcdClientCertKey.Cert()), EtcdClientKey: base64.StdEncoding.EncodeToString(etcdClientCertKey.Key()), - KubeCaCert: base64.StdEncoding.EncodeToString(kubeCA.Cert()), - KubeCaKey: base64.StdEncoding.EncodeToString(kubeCA.Key()), McsTLSCert: base64.StdEncoding.EncodeToString(mcsCertKey.Cert()), McsTLSKey: base64.StdEncoding.EncodeToString(mcsCertKey.Key()), PullSecretBase64: base64.StdEncoding.EncodeToString([]byte(installConfig.Config.PullSecret)), diff --git a/pkg/asset/manifests/template.go b/pkg/asset/manifests/template.go index 1652ec727c4..c2cf0769dbe 100644 --- a/pkg/asset/manifests/template.go +++ b/pkg/asset/manifests/template.go @@ -21,8 +21,6 @@ type bootkubeTemplateData struct { EtcdCaCert string EtcdClientCert string EtcdClientKey string - KubeCaCert string - KubeCaKey string McsTLSCert string McsTLSKey string PullSecretBase64 string