aws: Add a knob to disable self-hosted kubelet

This commit adds a boolean variable to controller config called `disable_self_hosted_kubelet`. Signed-off-by: Suraj Deshmukh <suraj@kinvolk.io>
kinvolk · May 15, 2020 · 73ebf14 · 73ebf14
1 parent 07fe3ca
commit 73ebf14
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 18 deletions.
diff --git a/assets/lokomotive-kubernetes/aws/flatcar-linux/kubernetes/bootkube.tf b/assets/lokomotive-kubernetes/aws/flatcar-linux/kubernetes/bootkube.tf
@@ -14,4 +14,7 @@ module "bootkube" {
   enable_aggregation    = var.enable_aggregation
 
   certs_validity_period_hours = var.certs_validity_period_hours
+
+  # Disable the self hosted kubelet
+  disable_self_hosted_kubelet = var.disable_self_hosted_kubelet
 }
diff --git a/assets/lokomotive-kubernetes/aws/flatcar-linux/kubernetes/variables.tf b/assets/lokomotive-kubernetes/aws/flatcar-linux/kubernetes/variables.tf
@@ -151,6 +151,11 @@ variable "enable_aggregation" {
   default     = true
 }
 
+variable "disable_self_hosted_kubelet" {
+  description = "Disable the self hosted kubelet installed by default"
+  type = bool
+}
+
 # Certificates
 
 variable "certs_validity_period_hours" {

diff --git a/pkg/assets/generated_assets.go b/pkg/assets/generated_assets.go
diff --git a/pkg/platform/aws/aws.go b/pkg/platform/aws/aws.go
@@ -77,6 +77,7 @@ type config struct {
 	EnableReporting          bool              `hcl:"enable_reporting,optional"`
 	CertsValidityPeriodHours int               `hcl:"certs_validity_period_hours,optional"`
 	WorkerPools              []workerPool      `hcl:"worker_pool,block"`
+	DisableSelfHostedKubelet bool              `hcl:"disable_self_hosted_kubelet,optional"`
 }
 
 // init registers aws as a platform

diff --git a/pkg/platform/aws/template.go b/pkg/platform/aws/template.go
@@ -92,6 +92,8 @@ module "aws-{{.Config.ClusterName}}" {
   {{- if .Config.CertsValidityPeriodHours }}
   certs_validity_period_hours = {{.Config.CertsValidityPeriodHours}}
   {{- end }}
+
+  disable_self_hosted_kubelet = {{ .Config.DisableSelfHostedKubelet }}
 }
 
 {{ range $index, $pool := .Config.WorkerPools }}