Replace deprecated hyberkube image

kubernetes/kubernetes#88676

common.tf

@@ -65,7 +65,7 @@ data "ignition_file" "kubelet" {
   path       = "/opt/bin/kubelet"
 
   source {
-    source = "https://storage.googleapis.com/kubernetes-release/release/${var.hyperkube_image_tag}/bin/linux/amd64/kubelet"
+    source = "https://storage.googleapis.com/kubernetes-release/release/${var.kubernetes_version}/bin/linux/amd64/kubelet"
   }
 }
 

master.tf

@@ -304,8 +304,7 @@ data "template_file" "kube-apiserver" {
   template = file("${path.module}/resources/kube-apiserver.yaml")
 
   vars = {
-    hyperkube_image_url   = var.hyperkube_image_url
-    hyperkube_image_tag   = var.hyperkube_image_tag
+    kubernetes_version    = var.kubernetes_version
     etcd_endpoints        = join(",", formatlist("https://%s:2379", var.etcd_addresses))
     service_network       = var.service_network
     master_address        = var.external_apiserver_address == "" ? var.master_address : var.external_apiserver_address
@@ -353,12 +352,11 @@ data "template_file" "kube-controller-manager" {
   template = file("${path.module}/resources/kube-controller-manager.yaml")
 
   vars = {
-    hyperkube_image_url = var.hyperkube_image_url
-    hyperkube_image_tag = var.hyperkube_image_tag
-    cloud_provider      = var.cloud_provider
-    cloud_config        = var.kube_controller_cloud_config
-    pod_network         = var.pod_network
-    feature_gates       = local.feature_gates_csv
+    kubernetes_version = var.kubernetes_version
+    cloud_provider     = var.cloud_provider
+    cloud_config       = var.kube_controller_cloud_config
+    pod_network        = var.pod_network
+    feature_gates      = local.feature_gates_csv
   }
 }
 
@@ -386,9 +384,8 @@ data "template_file" "kube-scheduler" {
   template = file("${path.module}/resources/kube-scheduler.yaml")
 
   vars = {
-    hyperkube_image_url = var.hyperkube_image_url
-    hyperkube_image_tag = var.hyperkube_image_tag
-    feature_gates       = local.feature_gates_csv
+    kubernetes_version = var.kubernetes_version
+    feature_gates      = local.feature_gates_csv
   }
 }
 

resources/kube-apiserver.yaml

@@ -9,7 +9,7 @@ spec:
   hostNetwork: true
   containers:
   - name: kube-apiserver
-    image: ${hyperkube_image_url}:${hyperkube_image_tag}
+    image: k8s.gcr.io/kube-apiserver:${kubernetes_version}
     command:
     - kube-apiserver
     - --etcd-servers=${etcd_endpoints}

resources/kube-controller-manager.yaml

@@ -8,7 +8,7 @@ metadata:
 spec:
   containers:
   - name: kube-controller-manager
-    image: ${hyperkube_image_url}:${hyperkube_image_tag}
+    image: k8s.gcr.io/kube-controller-manager:${kubernetes_version}
     command:
     - kube-controller-manager
     - --kubeconfig=/etc/kubernetes/config/controller-manager.conf

resources/kube-scheduler.yaml

@@ -9,7 +9,7 @@ spec:
   hostNetwork: true
   containers:
   - name: kube-scheduler
-    image: ${hyperkube_image_url}:${hyperkube_image_tag}
+    image: k8s.gcr.io/kube-scheduler:${kubernetes_version}
     command:
     - kube-scheduler
     - --config=/etc/kubernetes/config/kube-scheduler-config.yaml

variables.tf

@@ -47,13 +47,8 @@ variable "node_exporter_image_tag" {
   default     = "v1.0.1"
 }
 
-variable "hyperkube_image_url" {
-  description = "Where to get the hyperkube image from."
-  default     = "gcr.io/google-containers/hyperkube-amd64"
-}
-
-variable "hyperkube_image_tag" {
-  description = "The version of the hyperkube image to use."
+variable "kubernetes_version" {
+  description = "Kubernetes version, used to specify k8s.gcr.io docker image version and Kubernetes binaries"
   default     = "v1.18.3"
 }