From 8875417bc39f7218f99bec59ae226763b9d19870 Mon Sep 17 00:00:00 2001
From: Carter <mckdev@amazon.com>
Date: Wed, 5 Apr 2023 14:36:01 -0700
Subject: [PATCH] Create KUBELET_ARGS dropin after configuration container
 runtime (#1257)

---
 files/bootstrap.sh | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/files/bootstrap.sh b/files/bootstrap.sh
index c9b5da054..539752d8a 100755
--- a/files/bootstrap.sh
+++ b/files/bootstrap.sh
@@ -485,19 +485,7 @@ fi
 
 KUBELET_ARGS="$KUBELET_ARGS --cloud-provider=$KUBELET_CLOUD_PROVIDER"
 
-mkdir -p /etc/systemd/system/kubelet.service.d
-
-cat << EOF > /etc/systemd/system/kubelet.service.d/10-kubelet-args.conf
-[Service]
-Environment='KUBELET_ARGS=$KUBELET_ARGS'
-EOF
-
-if [[ -n "$KUBELET_EXTRA_ARGS" ]]; then
-  cat << EOF > /etc/systemd/system/kubelet.service.d/30-kubelet-extra-args.conf
-[Service]
-Environment='KUBELET_EXTRA_ARGS=$KUBELET_EXTRA_ARGS'
-EOF
-fi
+mkdir -p /etc/systemd/system
 
 if [[ "$CONTAINER_RUNTIME" = "containerd" ]]; then
   if $ENABLE_DOCKER_BRIDGE; then
@@ -568,6 +556,21 @@ else
   exit 1
 fi
 
+mkdir -p /etc/systemd/system/kubelet.service.d
+
+cat << EOF > /etc/systemd/system/kubelet.service.d/10-kubelet-args.conf
+[Service]
+Environment='KUBELET_ARGS=$KUBELET_ARGS'
+EOF
+
+if [[ -n "$KUBELET_EXTRA_ARGS" ]]; then
+  cat << EOF > /etc/systemd/system/kubelet.service.d/30-kubelet-extra-args.conf
+[Service]
+Environment='KUBELET_EXTRA_ARGS=$KUBELET_EXTRA_ARGS'
+EOF
+fi
+
+systemctl daemon-reload
 systemctl enable kubelet
 systemctl start kubelet