Merge pull request #4794 from rccrdpccl/add-kubelet-labels-base-template

MGMT-19337: enable injection of custom kubelet labels via env var in base template

Author: openshift-merge-bot[bot]

templates/master/01-master-kubelet/_base/units/kubelet.service.yaml

@@ -28,7 +28,7 @@ contents: |
         --kubeconfig=/var/lib/kubelet/kubeconfig \
         --container-runtime-endpoint=/var/run/crio/crio.sock \
         --runtime-cgroups=/system.slice/crio.service \
-        --node-labels=node-role.kubernetes.io/control-plane,node-role.kubernetes.io/master,node.openshift.io/os_id=${ID} \
+        --node-labels=node-role.kubernetes.io/control-plane,node-role.kubernetes.io/master,node.openshift.io/os_id=${ID},${CUSTOM_KUBELET_LABELS} \
 {{- if or (eq .IPFamilies "DualStack") (eq .IPFamilies "DualStackIPv6Primary") }}
         --node-ip=${KUBELET_NODE_IPS} \
 {{- else}}

templates/worker/01-worker-kubelet/_base/units/kubelet.service.yaml

@@ -28,7 +28,7 @@ contents: |
         --kubeconfig=/var/lib/kubelet/kubeconfig \
         --container-runtime-endpoint=/var/run/crio/crio.sock \
         --runtime-cgroups=/system.slice/crio.service \
-        --node-labels=node-role.kubernetes.io/worker,node.openshift.io/os_id=${ID} \
+        --node-labels=node-role.kubernetes.io/worker,node.openshift.io/os_id=${ID},${CUSTOM_KUBELET_LABELS} \
 {{- if or (eq .IPFamilies "DualStack") (eq .IPFamilies "DualStackIPv6Primary") }}
         --node-ip=${KUBELET_NODE_IPS} \
 {{- else}}