From 280315ca68f6027fc04dde23eee2eb2b219907c1 Mon Sep 17 00:00:00 2001
From: kfox1111 <Kevin.Fox@pnnl.gov>
Date: Mon, 3 Apr 2023 10:37:19 -0700
Subject: [PATCH] Fix namespace-override github test summary (#154)

Co-authored-by: Marco Franssen <marco.franssen@gmail.com>
Signed-off-by: Marco Franssen <marco.franssen@gmail.com>
---
 .../tests/namespace-override/post-install.sh  | 24 ++++++++++++++-----
 .github/workflows/helm-chart-ci.yaml          |  3 ++-
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/.github/tests/namespace-override/post-install.sh b/.github/tests/namespace-override/post-install.sh
index d93ebd9..c565da6 100755
--- a/.github/tests/namespace-override/post-install.sh
+++ b/.github/tests/namespace-override/post-install.sh
@@ -5,17 +5,29 @@ set -x
 SCRIPT=$(readlink -f "$0")
 SCRIPTPATH=$(dirname "$SCRIPT")
 
-k_wait=(kubectl wait --for condition=available --timeout 30s --namespace)
-k_rollout_status=(kubectl rollout status --watch --timeout 30s --namespace)
+k_wait () {
+  kubectl wait --for condition=available --timeout 30s --namespace "$1" "$2" "$3" | tail -n 1
+}
+
+k_rollout_status () {
+  kubectl rollout status --watch --timeout 30s --namespace "$1" "$2" "$3" | tail -n 1
+}
+
+RELEASE=$(helm ls --no-headers -n "${scenario}" | awk '{print $1}' | grep 'spire-[^-]*$')
 
 cat <<EOF >>"$GITHUB_STEP_SUMMARY"
+### release
+| release |
+| ------- |
+| $RELEASE |
+
 ### spire
 | workload | Status |
 | -------- | ------ |
-| spire-server | $("${k_rollout_status[@]}" spire-server statefulset spire-server) |
-| spire-spiffe-csi-driver | $("${k_rollout_status[@]}" spire-system daemonset spire-spiffe-csi-driver) |
-| spire-agent | $("${k_rollout_status[@]}" spire-system daemonset spire-agent) |
-| spire-spiffe-oidc-discovery-provider | $("${k_wait[@]}" spire-server deployments.apps spire-spiffe-oidc-discovery-provider) |
+| spire-server | <pre>$(k_rollout_status spire-server statefulset "${RELEASE}-server")</pre> |
+| spire-spiffe-csi-driver | <pre>$(k_rollout_status spire-system daemonset "${RELEASE}-spiffe-csi-driver")</pre> |
+| spire-agent | <pre>$(k_rollout_status spire-system daemonset "${RELEASE}-agent")</pre> |
+| spire-spiffe-oidc-discovery-provider | <pre>$(k_wait spire-server deployments.apps "${RELEASE}-spiffe-oidc-discovery-provider")</pre> |
 EOF
 
 if [ $1 -ne 0 ]; then
diff --git a/.github/workflows/helm-chart-ci.yaml b/.github/workflows/helm-chart-ci.yaml
index 64d0a0b..c55fd18 100644
--- a/.github/workflows/helm-chart-ci.yaml
+++ b/.github/workflows/helm-chart-ci.yaml
@@ -20,7 +20,7 @@ concurrency:
 env:
   HELM_VERSION: v3.11.1
   PYTHON_VERSION: 3.11.2
-  CHART_TESTING_VERSION: v3.7.1
+  CHART_TESTING_VERSION: v3.8.0
 
 jobs:
   checks:
@@ -189,6 +189,7 @@ jobs:
               --namespace "${scenario}" \
               --target-branch ${{ github.base_ref }} \
               --exclude-deprecated \
+              --skip-clean-up \
               ${{ (matrix.values != 'default' && '--helm-extra-set-args "--values=${TEST_DIR}/values.yaml ${EXTRA_HELM_ARGS}"') || '' }}
           fi
         env: