simpler bash

Author: aranabhat

pipelines/lib/util.groovy

@@ -446,7 +446,7 @@ def saveCache(
 
 def labelPod(){
   if (env.NODE_NAME && (env.NODE_NAME =~ /(manager|snowflake)/)) {
-        echo "Skipping pod label: ${env.NODE_NAME} is a static/snowflake node."
+        echo "Skipping pod label: ${env.NODE_NAME} is a static manager/snowflake node."
         return
   }
 
@@ -470,37 +470,35 @@ def labelPod(){
 
   def jsonLabels = groovy.json.JsonOutput.toJson([metadata: [labels: labels]])
   echo "jsonLabels: ${jsonLabels}"
+  writeFile file: '/tmp/patch.json', text: jsonLabels
 
-  bash """
+  bash '''
   set -eu
   set +x
 
   SA=/var/run/secrets/kubernetes.io/serviceaccount
-  [ -r "\$SA/token" ] || { echo "not in k8s; skipping pod label"; exit 0; }
-  NS=\$(cat \$SA/namespace)
-  POD=\${HOSTNAME}
-  TOKEN=\$(cat \$SA/token)
-  CA=\$SA/ca.crt
-
-  cat <<EOF > /tmp/patch.json
-${jsonLabels}
-EOF
-
-  if curl -sS --fail \\
-    --cacert "\$CA" \\
-    -H "Authorization: Bearer \$TOKEN" \\
-    -H "Content-Type: application/merge-patch+json" \\
-    -X PATCH \\
-    "https://kubernetes.default.svc/api/v1/namespaces/\$NS/pods/\$POD" \\
+  [ -r "$SA/token" ] || { echo "not in k8s; skipping pod label"; exit 0; }
+  NS=$(cat $SA/namespace)
+  POD=${HOSTNAME}
+  TOKEN=$(cat $SA/token)
+  CA=$SA/ca.crt
+
+
+  if curl -sS --fail \
+    --cacert "$CA" \
+    -H "Authorization: Bearer $TOKEN" \
+    -H "Content-Type: application/merge-patch+json" \
+    -X PATCH \
+    "https://kubernetes.default.svc/api/v1/namespaces/\$NS/pods/\$POD" \
     --data-binary @/tmp/patch.json >/dev/null
   then
-    echo "labeled for pod \$NS/\$POD"
+    echo "labeled for pod $NS/$POD"
   else
-    echo "pod label skipped for \$NS/\$POD"
+    echo "pod label skipped for $NS/$POD"
     exit 0
   fi
   set -x
-  """
+  '''
 
 }