manifests: new configmap etcd-serving-ca.kube-system

Manifest to create this resources belongs in installer. The renderer in cluster-kube-apiserver-operator will need to be also changed to stop creating the same manifest file.
openshift · Nov 1, 2018 · 414aab1 · 414aab1
1 parent 251d073
commit 414aab1
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 7 deletions.
diff --git a/pkg/asset/manifests/content/bootkube/kube-system-configmap-etcd-serving-ca.go b/pkg/asset/manifests/content/bootkube/kube-system-configmap-etcd-serving-ca.go
@@ -0,0 +1,23 @@
+package bootkube
+
+import "text/template"
+
+var (
+	// KubeSystemConfigmapEtcdServingCA  is the constant to represent contents of kube-system-configmap-etcd-serving-ca.yaml file
+	KubeSystemConfigmapEtcdServingCA = template.Must(template.New("kube-system-configmap-etcd-serving-ca.yaml").Parse(`
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: etcd-serving-ca
+  namespace: kube-system
+  labels:
+    tier: "control-plane"
+    k8s-app: "kube-apiserver"
+    openshift.io/control-plane: "true"
+    openshift.io/component: "api"
+data:
+  ca-bundle.crt: |
+    {{.EtcdCaCert}}
+`))
+)
diff --git a/pkg/asset/manifests/operators.go b/pkg/asset/manifests/operators.go
@@ -123,13 +123,14 @@ func (m *Manifests) generateBootKubeManifests(dependencies asset.Parents) []*ass
 	}
 
 	assetData := map[string][]byte{
-		"kube-cloud-config.yaml":                applyTemplateData(bootkube.KubeCloudConfig, templateData),
-		"machine-config-server-tls-secret.yaml": applyTemplateData(bootkube.MachineConfigServerTLSSecret, templateData),
-		"openshift-service-signer-secret.yaml":  applyTemplateData(bootkube.OpenshiftServiceCertSignerSecret, templateData),
-		"pull.json":                             applyTemplateData(bootkube.Pull, templateData),
-		"tectonic-network-operator.yaml":        applyTemplateData(bootkube.TectonicNetworkOperator, templateData),
-		"cvo-overrides.yaml":                    applyTemplateData(bootkube.CVOOverrides, templateData),
-		"etcd-service-endpoints.yaml":           applyTemplateData(bootkube.EtcdServiceEndpointsKubeSystem, templateData),
+		"kube-cloud-config.yaml":                     applyTemplateData(bootkube.KubeCloudConfig, templateData),
+		"machine-config-server-tls-secret.yaml":      applyTemplateData(bootkube.MachineConfigServerTLSSecret, templateData),
+		"openshift-service-signer-secret.yaml":       applyTemplateData(bootkube.OpenshiftServiceCertSignerSecret, templateData),
+		"pull.json":                                  applyTemplateData(bootkube.Pull, templateData),
+		"tectonic-network-operator.yaml":             applyTemplateData(bootkube.TectonicNetworkOperator, templateData),
+		"cvo-overrides.yaml":                         applyTemplateData(bootkube.CVOOverrides, templateData),
+		"etcd-service-endpoints.yaml":                applyTemplateData(bootkube.EtcdServiceEndpointsKubeSystem, templateData),
+		"kube-system-configmap-etcd-serving-ca.yaml": applyTemplateData(bootkube.KubeSystemConfigmapEtcdServingCA, templateData),
 
 		"01-tectonic-namespace.yaml":                 []byte(bootkube.TectonicNamespace),
 		"03-openshift-web-console-namespace.yaml":    []byte(bootkube.OpenshiftWebConsoleNamespace),