controller-manager: Move to use dedicated image

This commit changes the controller-manager configs to use the dedicated controller-manager container image instead of using hyperkube image. Signed-off-by: Suraj Deshmukh <suraj@kinvolk.io>
kinvolk · Mar 26, 2020 · 4585975 · 4585975
1 parent 993fb09
commit 4585975
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 31 deletions.
diff --git a/assets/lokomotive-kubernetes/bootkube/assets.tf b/assets/lokomotive-kubernetes/bootkube/assets.tf
@@ -4,13 +4,14 @@ resource "template_dir" "bootstrap-manifests" {
   destination_dir = "${var.asset_dir}/bootstrap-manifests"
 
   vars = {
-    hyperkube_image      = var.container_images["hyperkube"]
-    kube_apiserver_image = var.container_images["kube_apiserver"]
-    etcd_servers         = join(",", formatlist("https://%s:2379", var.etcd_servers))
-    cloud_provider       = var.cloud_provider
-    pod_cidr             = var.pod_cidr
-    service_cidr         = var.service_cidr
-    trusted_certs_dir    = var.trusted_certs_dir
+    hyperkube_image               = var.container_images["hyperkube"]
+    kube_apiserver_image          = var.container_images["kube_apiserver"]
+    kube_controller_manager_image = var.container_images["kube_controller_manager"]
+    etcd_servers                  = join(",", formatlist("https://%s:2379", var.etcd_servers))
+    cloud_provider                = var.cloud_provider
+    pod_cidr                      = var.pod_cidr
+    service_cidr                  = var.service_cidr
+    trusted_certs_dir             = var.trusted_certs_dir
   }
 }
 
@@ -75,19 +76,20 @@ data "template_file" "kubernetes" {
   template = "${file("${path.module}/resources/charts/kubernetes.yaml")}"
 
   vars = {
-    hyperkube_image        = var.container_images["hyperkube"]
-    coredns_image          = "${var.container_images["coredns"]}${var.container_arch}"
-    control_plane_replicas = max(2, length(var.etcd_servers))
-    cloud_provider         = var.cloud_provider
-    pod_cidr               = var.pod_cidr
-    service_cidr           = var.service_cidr
-    cluster_domain_suffix  = var.cluster_domain_suffix
-    cluster_dns_service_ip = cidrhost(var.service_cidr, 10)
-    trusted_certs_dir      = var.trusted_certs_dir
-    ca_cert                = base64encode(tls_self_signed_cert.kube-ca.cert_pem)
-    ca_key                 = base64encode(tls_private_key.kube-ca.private_key_pem)
-    server                 = format("https://%s:%s", var.api_servers[0], var.external_apiserver_port)
-    serviceaccount_key     = base64encode(tls_private_key.service-account.private_key_pem)
+    hyperkube_image               = var.container_images["hyperkube"]
+    kube_controller_manager_image = var.container_images["kube_controller_manager"]
+    coredns_image                 = "${var.container_images["coredns"]}${var.container_arch}"
+    control_plane_replicas        = max(2, length(var.etcd_servers))
+    cloud_provider                = var.cloud_provider
+    pod_cidr                      = var.pod_cidr
+    service_cidr                  = var.service_cidr
+    cluster_domain_suffix         = var.cluster_domain_suffix
+    cluster_dns_service_ip        = cidrhost(var.service_cidr, 10)
+    trusted_certs_dir             = var.trusted_certs_dir
+    ca_cert                       = base64encode(tls_self_signed_cert.kube-ca.cert_pem)
+    ca_key                        = base64encode(tls_private_key.kube-ca.private_key_pem)
+    server                        = format("https://%s:%s", var.api_servers[0], var.external_apiserver_port)
+    serviceaccount_key            = base64encode(tls_private_key.service-account.private_key_pem)
   }
 }
 

diff --git a/...otive-kubernetes/bootkube/resources/bootstrap-manifests/bootstrap-controller-manager.yaml b/...otive-kubernetes/bootkube/resources/bootstrap-manifests/bootstrap-controller-manager.yaml
@@ -8,9 +8,8 @@ metadata:
 spec:
   containers:
   - name: kube-controller-manager
-    image: ${hyperkube_image}
+    image: ${kube_controller_manager_image}
     command:
-    - ./hyperkube
     - kube-controller-manager
     - --allocate-node-cidrs=true
     - --cluster-cidr=${pod_cidr}

diff --git a/assets/lokomotive-kubernetes/bootkube/resources/charts/kubernetes.yaml b/assets/lokomotive-kubernetes/bootkube/resources/charts/kubernetes.yaml
@@ -2,7 +2,7 @@ controllerManager:
   serviceAccountKey: ${serviceaccount_key}
   caCert: ${ca_cert}
   caKey: ${ca_key}
-  image: ${hyperkube_image}
+  image: ${kube_controller_manager_image}
   cloudProvider: ${cloud_provider}
   serviceCIDR: ${service_cidr}
   podCIDR: ${pod_cidr}

diff --git a/...ve-kubernetes/bootkube/resources/charts/kubernetes/templates/kube-controller-manager.yaml b/...ve-kubernetes/bootkube/resources/charts/kubernetes/templates/kube-controller-manager.yaml
@@ -51,7 +51,6 @@ spec:
       - name: kube-controller-manager
         image: {{ .Values.controllerManager.image }}
         command:
-        - ./hyperkube
         - kube-controller-manager
         - --use-service-account-credentials
         - --allocate-node-cidrs=true

diff --git a/assets/lokomotive-kubernetes/bootkube/resources/charts/kubernetes/values.yaml b/assets/lokomotive-kubernetes/bootkube/resources/charts/kubernetes/values.yaml
@@ -2,7 +2,7 @@ controllerManager:
   serviceAccountKey:
   caCert:
   caKey:
-  image: k8s.gcr.io/hyperkube:v1.18.0
+  image: k8s.gcr.io/kube-controller-manager:v1.18.0
   cloudProvider:
   serviceCIDR: 10.0.0.0/24
   podCIDR: 10.2.0.0/16

diff --git a/assets/lokomotive-kubernetes/bootkube/variables.tf b/assets/lokomotive-kubernetes/bootkube/variables.tf
@@ -89,12 +89,13 @@ variable "container_images" {
   type        = map(string)
 
   default = {
-    calico           = "calico/node:v3.13.1"
-    calico_cni       = "calico/cni:v3.13.1"
-    hyperkube        = "k8s.gcr.io/hyperkube:v1.18.0"
-    coredns          = "coredns/coredns:coredns-"
-    pod_checkpointer = "kinvolk/pod-checkpointer:83e25e5968391b9eb342042c435d1b3eeddb2be1"
-    kube_apiserver   = "k8s.gcr.io/kube-apiserver:v1.18.0"
+    calico                  = "calico/node:v3.13.1"
+    calico_cni              = "calico/cni:v3.13.1"
+    hyperkube               = "k8s.gcr.io/hyperkube:v1.18.0"
+    coredns                 = "coredns/coredns:coredns-"
+    pod_checkpointer        = "kinvolk/pod-checkpointer:83e25e5968391b9eb342042c435d1b3eeddb2be1"
+    kube_apiserver          = "k8s.gcr.io/kube-apiserver:v1.18.0"
+    kube_controller_manager = "k8s.gcr.io/kube-controller-manager:v1.18.0"
   }
 }