kubelet Helm chart: add support for setting --cloud-provider flag

Using CCM on Kubernetes requires --cloud-provider to be set to "external". This commit enables this customization. Default value remains empty string, so no flag will be set for compatibility with other platforms. Refs #548 Signed-off-by: knrt10 <[email protected]>
kinvolk · Nov 23, 2020 · a50ca11 · a50ca11
1 parent ccd4125
commit a50ca11
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/assets/charts/control-plane/kubelet/templates/kubelet-ds.yaml b/assets/charts/control-plane/kubelet/templates/kubelet-ds.yaml
@@ -36,6 +36,9 @@ spec:
           --authorization-mode=Webhook \
           --client-ca-file=/etc/kubernetes/ca.crt \
           --cluster_dns={{ .Values.clusterDNS }} \
+          {{- if .Values.cloudProvider }}
+          --cloud-provider={{ .Values.cloudProvider }} \
+          {{- end }}
           --cluster_domain={{ .Values.clusterDomain }} \
           --cni-conf-dir=/etc/cni/net.d \
           --config=/etc/kubernetes/kubelet.config \

diff --git a/assets/charts/control-plane/kubelet/values.yaml b/assets/charts/control-plane/kubelet/values.yaml
@@ -2,3 +2,4 @@ image: quay.io/poseidon/kubelet:v1.19.3
 clusterDNS: 10.0.0.10
 clusterDomain: cluster.local
 enableTLSBootstrap: true
+cloudProvider:
diff --git a/assets/terraform-modules/bootkube/assets.tf b/assets/terraform-modules/bootkube/assets.tf
@@ -113,6 +113,7 @@ locals {
     cluster_dns_service_ip = cidrhost(var.service_cidr, 10)
     cluster_domain_suffix  = var.cluster_domain_suffix
     enable_tls_bootstrap   = var.enable_tls_bootstrap
+    cloud_provider         = var.cloud_provider
   })
 
   kubeconfig_kubelet_content = templatefile("${path.module}/resources/kubeconfig-kubelet", {

diff --git a/assets/terraform-modules/bootkube/resources/charts/kubelet.yaml b/assets/terraform-modules/bootkube/resources/charts/kubelet.yaml
@@ -2,3 +2,4 @@ image: ${kubelet_image}
 clusterDNS: ${cluster_dns_service_ip}
 clusterDomain: ${cluster_domain_suffix}
 enableTLSBootstrap: ${enable_tls_bootstrap}
+cloudProvider: ${cloud_provider}