pkg/asset/manifests: define EtcdMetrics dependencies.

Signed-off-by: Sam Batschelet <sbatsche@redhat.com>
openshift · Feb 25, 2019 · 1737e38 · 1737e38
1 parent 86b9409
commit 1737e38
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/pkg/asset/manifests/operators.go b/pkg/asset/manifests/operators.go
@@ -61,6 +61,8 @@ func (m *Manifests) Dependencies() []asset.Asset {
 		&tls.RootCA{},
 		&tls.EtcdCA{},
 		&tls.EtcdClientCertKey{},
+		&tls.EtcdMetricsCA{},
+		&tls.EtcdMetricsClientCertKey{},
 		&tls.MCSCertKey{},
 
 		&bootkube.KubeCloudConfig{},
@@ -125,12 +127,16 @@ func (m *Manifests) generateBootKubeManifests(dependencies asset.Parents) []*ass
 	etcdCA := &tls.EtcdCA{}
 	mcsCertKey := &tls.MCSCertKey{}
 	etcdClientCertKey := &tls.EtcdClientCertKey{}
+	etcdMetricsCA := &tls.EtcdMetricsCA{}
+	etcdMetricsClientCertKey := &tls.EtcdMetricsClientCertKey{}
 	rootCA := &tls.RootCA{}
 	dependencies.Get(
 		clusterID,
 		installConfig,
 		etcdCA,
 		etcdClientCertKey,
+		etcdMetricsCA,
+		etcdMetricsClientCertKey,
 		mcsCertKey,
 		rootCA,
 	)
@@ -145,6 +151,9 @@ func (m *Manifests) generateBootKubeManifests(dependencies asset.Parents) []*ass
 		EtcdCaCert:                      string(etcdCA.Cert()),
 		EtcdClientCert:                  base64.StdEncoding.EncodeToString(etcdClientCertKey.Cert()),
 		EtcdClientKey:                   base64.StdEncoding.EncodeToString(etcdClientCertKey.Key()),
+		EtcdMetricsCaCert:               string(etcdMetricsCA.Cert()),
+		EtcdMetricsClientCert:           base64.StdEncoding.EncodeToString(etcdMetricsClientCertKey.Cert()),
+		EtcdMetricsClientKey:            base64.StdEncoding.EncodeToString(etcdMetricsClientCertKey.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
@@ -21,6 +21,9 @@ type bootkubeTemplateData struct {
 	EtcdCaCert                      string
 	EtcdClientCert                  string
 	EtcdClientKey                   string
+	EtcdMetricsCaCert               string
+	EtcdMetricsClientCert           string
+	EtcdMetricsClientKey            string
 	McsTLSCert                      string
 	McsTLSKey                       string
 	PullSecretBase64                string