panxiao81/helm-charts-hardened
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix namespace-override github test summary (#154)

Browse Source 
Co-authored-by: Marco Franssen <[email protected]>
Signed-off-by: Marco Franssen <[email protected]>
This commit is contained in:
kfox1111
2023-04-03 19:37:19 +02:00
committed by GitHub
co-authored by Marco Franssen
parent 072d952d9a
commit 280315ca68
2 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/tests/namespace-override/post-install.sh
+18 -6
View File
@@ -5,17 +5,29 @@ set -x
SCRIPT=$(readlink -f "$0") SCRIPT=$(readlink -f "$0")
SCRIPTPATH=$(dirname "$SCRIPT") SCRIPTPATH=$(dirname "$SCRIPT")
k_wait=(kubectl wait --for condition=available --timeout 30s --namespace) k_wait () {
k_rollout_status=(kubectl rollout status --watch --timeout 30s --namespace) 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" cat <<EOF >>"$GITHUB_STEP_SUMMARY"
### release
| release |
| ------- |
| $RELEASE |
### spire ### spire
| workload | Status | | workload | Status |
| -------- | ------ | | -------- | ------ |
| spire-server | $("${k_rollout_status[@]}" spire-server statefulset spire-server) | | spire-server | <pre>$(k_rollout_status spire-server statefulset "${RELEASE}-server")</pre> |
| spire-spiffe-csi-driver | $("${k_rollout_status[@]}" spire-system daemonset spire-spiffe-csi-driver) | | spire-spiffe-csi-driver | <pre>$(k_rollout_status spire-system daemonset "${RELEASE}-spiffe-csi-driver")</pre> |
| spire-agent | $("${k_rollout_status[@]}" spire-system daemonset spire-agent) | | spire-agent | <pre>$(k_rollout_status spire-system daemonset "${RELEASE}-agent")</pre> |
| spire-spiffe-oidc-discovery-provider | $("${k_wait[@]}" spire-server deployments.apps spire-spiffe-oidc-discovery-provider) | | spire-spiffe-oidc-discovery-provider | <pre>$(k_wait spire-server deployments.apps "${RELEASE}-spiffe-oidc-discovery-provider")</pre> |
EOF EOF
if [ $1 -ne 0 ]; then if [ $1 -ne 0 ]; then
.github/workflows/helm-chart-ci.yaml
+2 -1
View File
@@ -20,7 +20,7 @@ concurrency:
env: env:
HELM_VERSION: v3.11.1 HELM_VERSION: v3.11.1
PYTHON_VERSION: 3.11.2 PYTHON_VERSION: 3.11.2
CHART_TESTING_VERSION: v3.7.1 CHART_TESTING_VERSION: v3.8.0
jobs: jobs:
checks: checks:
@@ -189,6 +189,7 @@ jobs:
--namespace "${scenario}" \ --namespace "${scenario}" \
--target-branch ${{ github.base_ref }} \ --target-branch ${{ github.base_ref }} \
--exclude-deprecated \ --exclude-deprecated \
--skip-clean-up \
${{ (matrix.values != 'default' && '--helm-extra-set-args "--values=${TEST_DIR}/values.yaml ${EXTRA_HELM_ARGS}"') || '' }} ${{ (matrix.values != 'default' && '--helm-extra-set-args "--values=${TEST_DIR}/values.yaml ${EXTRA_HELM_ARGS}"') || '' }}
fi fi
env: env: