Merge pull request #51 from JarvusInnovations/develop

Release: v1.3.1

Author: themightychris

github-workflows/k8s-deploy.yml

@@ -28,11 +28,12 @@ jobs:
 
         # initialize empty log of kube operations
         echo -n '' > /tmp/kube.log
+        echo -n '' > /tmp/kube.err
 
     - name: 'Apply manifests: CRD resources'
       run: |
         if [ -d ./_/CustomResourceDefinition ]; then
-          kubectl apply -Rf ./_/CustomResourceDefinition | tee -a /tmp/kube.log
+          kubectl apply -Rf ./_/CustomResourceDefinition 2> >(tee -a /tmp/kube.err >&2) | tee -a /tmp/kube.log
         fi
 
     - name: 'Apply manifests: non-CRD global resources'
@@ -47,7 +48,7 @@ jobs:
               -print0 \
             | sort -z \
             | xargs -r0 -n 1 kubectl apply -Rf
-          ) | tee -a /tmp/kube.log
+          ) 2> >(tee -a /tmp/kube.err >&2) | tee -a /tmp/kube.log
         fi
 
     - name: 'Apply manifests: generated regcred secrets'
@@ -56,7 +57,7 @@ jobs:
         # apply a copy of regcred secret for every deployed namespace
         while IFS= read -r namespace; do
           namespace="$(basename "${namespace}")"
-          cat <<EOF | kubectl apply -f - | tee -a /tmp/kube.log
+          cat <<EOF | kubectl apply -f - 2> >(tee -a /tmp/kube.err >&2) | tee -a /tmp/kube.log
         apiVersion: v1
         kind: Secret
         metadata:
@@ -79,7 +80,7 @@ jobs:
             -print0 \
           | sort -z \
           | xargs -r0 -n 1 kubectl apply -Rf
-        ) | tee -a /tmp/kube.log
+        ) 2> >(tee -a /tmp/kube.err >&2) | tee -a /tmp/kube.log
 
     - name: 'Apply manifests: deleted resources'
       run: |
@@ -91,9 +92,9 @@ jobs:
           name="${kind_name##*/}"
 
           if [ "${namespace}" == "_" ]; then
-            kubectl delete $kind $name | tee -a /tmp/kube.log
+            kubectl delete $kind $name 2> >(tee -a /tmp/kube.err >&2) | tee -a /tmp/kube.log
           else
-            kubectl -n $namespace delete $kind $name | tee -a /tmp/kube.log
+            kubectl -n $namespace delete $kind $name 2> >(tee -a /tmp/kube.err >&2) | tee -a /tmp/kube.log
           fi
         done
 
@@ -113,6 +114,21 @@ jobs:
         EOF
         )"
 
+        # Filter error log to remove known warnings and blank lines
+        grep -v "Warning: Use tokens from the TokenRequest API" /tmp/kube.err | \
+        grep -v "^[[:space:]]*$" > /tmp/kube.err.filtered || true
+
+        # Conditionally append error output if it has meaningful content
+        if [ -s /tmp/kube.err.filtered ] && grep -q '[^[:space:]]' /tmp/kube.err.filtered 2>/dev/null; then
+            comment_body="${comment_body}
+
+        ## Errors/Warnings
+
+        \`\`\`
+        $(cat /tmp/kube.err.filtered)
+        \`\`\`"
+        fi
+
 
         ## get most recent merged PR
         echo

github-workflows/k8s-prepare.yml

@@ -40,8 +40,8 @@ jobs:
             -not -name '.*' \
             -print0 \
           | sort -z \
-          | xargs -r0 -n 1 kubectl diff -Rf || true
-        ) > /tmp/kube.diff
+          | xargs -r0 -n 1 sh -c 'kubectl diff -Rf "$1" || true' --
+        ) > /tmp/kube.diff 2> /tmp/kube.err
 
     - name: Create/update pull request
       env:
@@ -63,6 +63,21 @@ jobs:
         EOF
         )"
 
+        # Filter error log to remove known warnings and blank lines
+        grep -v "Warning: Use tokens from the TokenRequest API" /tmp/kube.err | \
+        grep -v "^[[:space:]]*$" > /tmp/kube.err.filtered || true
+
+        # Conditionally append error output if it has meaningful content
+        if [ -s /tmp/kube.err.filtered ] && grep -q '[^[:space:]]' /tmp/kube.err.filtered 2>/dev/null; then
+            pr_body="${pr_body}
+
+        ## Errors/Warnings
+
+        \`\`\`
+        $(cat /tmp/kube.err.filtered)
+        \`\`\`"
+        fi
+
 
         ## generate initial commit for base if needed
         if ! git ls-remote --exit-code --heads origin "${BRANCH_DEPLOY}"; then