rework kubelet configuration to have a file instead of bash script (#427

)

rework kubelet configuration to have a file instead of bash script

helm/cluster-aws/files/etc/kubelet-configuration.yaml

@@ -0,0 +1,4 @@
+apiVersion: kubelet.config.k8s.io/v1beta1
+kind: KubeletConfiguration
+shutdownGracePeriod: 300s
+shutdownGracePeriodCriticalPods: 60s

helm/cluster-aws/templates/_control_plane.tpl

@@ -245,7 +245,6 @@ spec:
     {{- include "flatcarKubeadmPreCommands" . | nindent 4 }}
     {{- if .Values.connectivity.proxy.enabled }}{{- include "proxyCommand" $ | nindent 4 }}{{- end }}
     postKubeadmCommands:
-    {{- include "kubeletConfigPostKubeadmCommands" . | nindent 4 }}
     {{- include "controlPlanePostKubeadmCommands" . | nindent 4 }}
     {{- if .Values.internal.migration.controlPlanePostKubeadmCommands -}}
     {{- toYaml .Values.internal.migration.controlPlanePostKubeadmCommands | nindent 4 }}

helm/cluster-aws/templates/_helpers.tpl

@@ -128,14 +128,14 @@ giantswarm.io/prevent-deletion: "true"
       key: registry-config.toml
 {{- end -}}
 {{- define "kubeletConfigFiles" -}}
-- path: /opt/kubelet-config.sh
+- path: /etc/kubelet-configuration.yaml
   permissions: "0700"
   encoding: base64
-  content: {{ $.Files.Get "files/opt/kubelet-config.sh" | b64enc }}
+  content: {{ .Files.Get "files/etc/kubelet-configuration.yaml" | b64enc }}
 - path: /etc/systemd/logind.conf.d/zzz-kubelet-graceful-shutdown.conf
   permissions: "0700"
   encoding: base64
-  content: {{ $.Files.Get "files/etc/systemd/logind.conf.d/zzz-kubelet-graceful-shutdown.conf" | b64enc }}
+  content: {{ .Files.Get "files/etc/systemd/logind.conf.d/zzz-kubelet-graceful-shutdown.conf" | b64enc }}
 {{- end -}}
 
 {{- define "kubernetesFiles" -}}
@@ -272,10 +272,6 @@ and is used to join the node to the teleport cluster.
 - /opt/control-plane-config.sh
 {{- end -}}
 
-{{- define "kubeletConfigPostKubeadmCommands" -}}
-- /bin/sh /opt/kubelet-config.sh
-{{- end -}}
-
 {{- define "sshUsers" -}}
 - name: giantswarm
   groups: sudo
@@ -364,6 +360,8 @@ imageLookupOrg: "706635527432"
 {{- define "flatcarKubeadmPreCommands" -}}
 - envsubst < /etc/kubeadm.yml > /etc/kubeadm.yml.tmp
 - mv /etc/kubeadm.yml.tmp /etc/kubeadm.yml
+- echo "---" >> /etc/kubeadm.yml
+- cat /etc/kubelet-configuration.yaml >> /etc/kubeadm.yml
 {{- end -}}
 
 {{/*

helm/cluster-aws/templates/_machine_pools.tpl

@@ -139,8 +139,6 @@ spec:
     {{- include "flatcarKubeadmPreCommands" . | nindent 4 }}
     {{- include "sshPreKubeadmCommands" . | nindent 4 }}
     {{- if $.Values.connectivity.proxy.enabled }}{{- include "proxyCommand" $ | nindent 4 }}{{- end }}
-  postKubeadmCommands:
-    {{- include "kubeletConfigPostKubeadmCommands" . | nindent 4 }}
   users:
   {{- include "sshUsers" . | nindent 2 }}
   files: