fix: kubelet unmarshal failed

getamis · Apr 21, 2022 · 0cb1bd7 · 0cb1bd7
1 parent ce96631
commit 0cb1bd7
Show file tree

Hide file tree

Showing 8 changed files with 85 additions and 51 deletions.
diff --git a/kube-apiserver.tf b/kube-apiserver.tf
@@ -81,7 +81,7 @@ data "ignition_file" "kube_apiserver" {
       etcd_endpoints = var.etcd_endpoints
       cluster_cidr   = var.pod_network_cidr
       service_cidr   = var.service_network_cidr
-      resources      = local.component_resources["kube-apiserver"]
+      resources      = local.components_resource["kube_apiserver"]
 
       // TODO: move to merged_apiserver_flags
       cloud_provider    = local.cloud_config.provider

diff --git a/kube-controller-manager.tf b/kube-controller-manager.tf
@@ -13,7 +13,7 @@ data "ignition_file" "kube_controller_manager" {
       cloud_provider    = local.cloud_config.provider
       cloud_config_flag = local.cloud_config.path != "" ? "- --cloud-config=${local.cloud_config.path}" : "# no cloud provider config given"
       extra_flags       = local.controller_manager_flags
-      resources         = local.component_resources["kube-controller-manager"]
+      resources         = local.components_resource["kube_controller_manager"]
     })
   }
 }

diff --git a/kube-scheduler.tf b/kube-scheduler.tf
@@ -8,7 +8,7 @@ data "ignition_file" "kube_scheduler" {
       image       = "${local.containers["kube_scheduler"].repo}:${local.containers["kube_scheduler"].tag}"
       kubeconfig  = "${local.etc_path}/scheduler.conf"
       extra_flags = local.scheduler_flags
-      resources   = local.component_resources["kube-scheduler"]
+      resources   = local.components_resource["kube_scheduler"]
     })
   }
 }
diff --git a/templates/manifests/kube-apiserver.yaml.tpl b/templates/manifests/kube-apiserver.yaml.tpl
@@ -54,7 +54,24 @@ spec:
       initialDelaySeconds: 15
       timeoutSeconds: 15
     resources:
-      ${indent(6, yamlencode(resources))}
+%{ if resources["cpu_request"] != "" || resources["memory_request"] != "" ~}
+      requests:
+%{ if resources["cpu_request"] != "" ~}
+        cpu: ${resources["cpu_request"]}
+%{ endif ~}
+%{ if resources["memory_request"] != "" ~}
+        memory: ${resources["memory_request"]}
+%{ endif ~}
+%{ endif ~}
+%{ if resources["cpu_limit"] != "" || resources["memory_limit"] != "" ~}
+      limits:
+%{ if resources["cpu_limit"] != "" ~}
+        cpu: ${resources["cpu_limit"]}
+%{ endif ~}
+%{ if resources["memory_limit"] != "" ~}
+        memory: ${resources["memory_limit"]}
+%{ endif ~}
+%{ endif ~}
     volumeMounts:
     - mountPath: /etc/ssl/certs
       name: ca-certs

diff --git a/templates/manifests/kube-controller-manager.yaml.tpl b/templates/manifests/kube-controller-manager.yaml.tpl
@@ -49,7 +49,24 @@ spec:
       initialDelaySeconds: 15
       timeoutSeconds: 15
     resources:
-      ${indent(6, yamlencode(resources))}
+%{ if resources["cpu_request"] != "" || resources["memory_request"] != "" ~}
+      requests:
+%{ if resources["cpu_request"] != "" ~}
+        cpu: ${resources["cpu_request"]}
+%{ endif ~}
+%{ if resources["memory_request"] != "" ~}
+        memory: ${resources["memory_request"]}
+%{ endif ~}
+%{ endif ~}
+%{ if resources["cpu_limit"] != "" || resources["memory_limit"] != "" ~}
+      limits:
+%{ if resources["cpu_limit"] != "" ~}
+        cpu: ${resources["cpu_limit"]}
+%{ endif ~}
+%{ if resources["memory_limit"] != "" ~}
+        memory: ${resources["memory_limit"]}
+%{ endif ~}
+%{ endif ~}
     volumeMounts:
     - mountPath: /etc/ssl/certs
       name: ca-certs

diff --git a/templates/manifests/kube-scheduler.yaml.tpl b/templates/manifests/kube-scheduler.yaml.tpl
@@ -33,7 +33,24 @@ spec:
       initialDelaySeconds: 15
       timeoutSeconds: 15
     resources:
-      ${indent(6, yamlencode(resources))}
+%{ if resources["cpu_request"] != "" || resources["memory_request"] != "" ~}
+      requests:
+%{ if resources["cpu_request"] != "" ~}
+        cpu: ${resources["cpu_request"]}
+%{ endif ~}
+%{ if resources["memory_request"] != "" ~}
+        memory: ${resources["memory_request"]}
+%{ endif ~}
+%{ endif ~}
+%{ if resources["cpu_limit"] != "" || resources["memory_limit"] != "" ~}
+      limits:
+%{ if resources["cpu_limit"] != "" ~}
+        cpu: ${resources["cpu_limit"]}
+%{ endif ~}
+%{ if resources["memory_limit"] != "" ~}
+        memory: ${resources["memory_limit"]}
+%{ endif ~}
+%{ endif ~}
     volumeMounts:
     - mountPath: ${kubeconfig}
       name: kubeconfig

diff --git a/variables.tf b/variables.tf
@@ -22,6 +22,17 @@ variable "containers" {
   default = {}
 }
 
+variable "components_resource" {
+  description = "Desired resource requests and limits of kubernetes components(kube-apiserver, kube-controller-manager, kube-scheduler, etc.)"
+  type = map(object({
+    cpu_request    = string
+    cpu_limit      = string
+    memory_request = string
+    memory_limit   = string
+  }))
+  default = {}
+}
+
 variable "internal_endpoint" {
   description = "The internal endpoint of kube-apiserver."
   type        = string
@@ -139,22 +150,6 @@ variable "scheduler_flags" {
   default     = {}
 }
 
-
-variable "component_resources" {
-  description = "Resource mangement for kube-apiserver, kube-controller-manager, kube-scheduler, etc."
-  type = map(object({
-    requests = object({
-      cpu    = string
-      memory = string
-    })
-    limits = object({
-      cpu    = string
-      memory = string
-    })
-  }))
-  default = {}
-}
-
 variable "certs" {
   description = "The kubernetes and etcd certificate."
   type        = map(string)

diff --git a/variables_defaults.tf b/variables_defaults.tf
@@ -119,36 +119,24 @@ locals {
     api_audiences = ""
   }, var.oidc_config)
 
-  component_resources = merge({
-    kube-apiserver = {
-      requests = {
-        cpu    = "400m"
-        memory = "1536Mi"
-      },
-      limits   = {
-        cpu    = "400m"
-        memory = "1536Mi"
-      }
+  components_resource = merge({
+    kube_apiserver = {
+      cpu_request    = "400m"
+      memory_request = "1536Mi"
+      cpu_limit      = "400m"
+      memory_limit   = "1536Mi"
     },
-    kube-controller-manager = {
-      requests = {
-        cpu    = "200m"
-        memory = ""
-      },
-      limits   = {
-        cpu    = ""
-        memory = ""
-      }
+    kube_controller_manager = {
+      cpu_request    = "200m"
+      memory_request = ""
+      cpu_limit      = ""
+      memory_limit   = ""
     },
-    kube-scheduler = {
-      requests = {
-        cpu    = "100m"
-        memory = ""
-      },
-      limits   = {
-        cpu    = ""
-        memory = ""
-      }
+    kube_scheduler = {
+      cpu_request    = "100m"
+      memory_request = ""
+      cpu_limit      = ""
+      memory_limit   = ""
     }
-  }, var.component_resources)
+  }, var.components_resource)
 }