Patch for provider ID args based on BOSH vm name / ID

gistfile1.txt

diff --git a/jobs/kubelet/templates/bin/kubelet b/jobs/kubelet/templates/bin/kubelet
index c5b0e52..a52cb13 100644
--- a/jobs/kubelet/templates/bin/kubelet
+++ b/jobs/kubelet/templates/bin/kubelet
@@ -34,6 +34,7 @@ end
 
 # set kube-* binaries in our path
 export PATH=$PATH:/var/vcap/packages/k8s/bin
+export PATH=$PATH:/var/vcap/packages/jq/bin
 
 case $1 in
   start)
@@ -41,6 +42,11 @@ case $1 in
 
     # FIXME: wait for containerd to be up and running
 
+    KUBELET_OPTIONS=
+    if grep -q vsphere /var/vcap/bosh/etc/infrastructure; then
+      KUBELET_OPTIONS="$KUBELET_OPTIONS --provider-id=$(cat /var/vcap/bosh/settings.json | jq -r '.vm.name')"
+    fi
+
     echo "[$(date)] $BIN/$$: starting up..."
     if [[ -f $PIDFILE ]]; then
       PID=$(head -1 $PIDFILE)
@@ -94,6 +100,7 @@ case $1 in
            --register-with-taints=<%= taints.join(',') %> \
            --hostname-override=<%= spec.id %>.k8s \
            --root-dir=/var/vcap/store/kubelet/ \
+           $KUBELET_OPTIONS \
            --v=2 <% p('kubelet.flags', []).each do |kv| %><% kv.each do |flag,value| %>--<%= flag %>="<%= value.to_s.gsub(/"/, '\\"') %>" <% end %><% end %>
     echo "[$(date)] $BIN/$$: exec failed!"
     exit 42