Merge pull request #3457 from openshift-cherrypick-robot/cherry-pick-…

…3449-to-release-4.12 [release-4.12] OCPBUGS-3311: [alicloud] provider ID not being set for kubelet
openshift · Dec 19, 2022 · b29dceb · b29dceb
2 parents 2f02dcc + 71a9dec
commit b29dceb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 26 deletions.
diff --git a/...files/usr-local-lib-systemd-system-generators-alibaba-kubelet-extra-env-generator.sh.yaml b/...files/usr-local-lib-systemd-system-generators-alibaba-kubelet-extra-env-generator.sh.yaml
@@ -3,29 +3,6 @@ path: "/usr/local/lib/systemd/system-generators/alibaba-kubelet-extra-env-genera
 contents:
   inline: |
     #!/bin/sh
-    set -euo pipefail
-
-    # This systemd.generator(7) determines the alibaba nodename and sets
-    # it as a variable for the kubelet.service unit file.
-    #
-    # Place in /usr/local/lib/systemd/system-generators
-
-    # Generators don't have logging right now
-    # https://github.com/systemd/systemd/issues/15638
-    exec 1>/dev/kmsg; exec 2>&1
-
-    # If invoked with no arguments (for testing) write to /tmp.
-    earlydir="/tmp"
-    if [ -n "$2" ]; then
-        earlydir="$2"
-    fi
-
-    kubelet_service_d_dir="$earlydir/kubelet.service.d"
-    node_env="$kubelet_service_d_dir/alibaba-extra-env.conf"
-
-    mkdir -p "$kubelet_service_d_dir"
-
-    # This must NOT be a here-document otherwise this script will generate this error:
-    #   alibaba-kubelet-extra-env-generator.sh: cannot create temp file for here-document: Read-only file system
-
-    echo -e "[Service]\nEnvironmentFile=/run/kubelet-alibaba.env" > "${node_env}"
+    # /run/kubelet-alibaba.env is now directly referenced from the alibabacloud kubelet
+    # unit definition. keeping this file but removing executable content as preexisting 
+    # files aren't removed.
diff --git a/templates/master/01-master-kubelet/alibabacloud/units/kubelet.service.yaml b/templates/master/01-master-kubelet/alibabacloud/units/kubelet.service.yaml
@@ -20,6 +20,7 @@ contents: |
   EnvironmentFile=-/etc/kubernetes/kubelet-workaround
   EnvironmentFile=-/etc/kubernetes/kubelet-env
   EnvironmentFile=/etc/node-sizing.env
+  EnvironmentFile=/run/kubelet-alibaba.env
 
   ExecStart=/usr/local/bin/kubenswrapper \
       /usr/bin/kubelet \

diff --git a/templates/worker/01-worker-kubelet/alibabacloud/units/kubelet.service.yaml b/templates/worker/01-worker-kubelet/alibabacloud/units/kubelet.service.yaml
@@ -20,6 +20,7 @@ contents: |
   EnvironmentFile=-/etc/kubernetes/kubelet-workaround
   EnvironmentFile=-/etc/kubernetes/kubelet-env
   EnvironmentFile=/etc/node-sizing.env
+  EnvironmentFile=/run/kubelet-alibaba.env
 
   ExecStart=/usr/local/bin/kubenswrapper \
       /usr/bin/kubelet \