From fe06657ffda579c8359d95878c63830983936394 Mon Sep 17 00:00:00 2001 From: walnuts1018 Date: Mon, 28 Oct 2024 22:02:20 +0900 Subject: [PATCH] fix Signed-off-by: walnuts1018 --- .github/workflows/k8s.yaml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/k8s.yaml b/.github/workflows/k8s.yaml index b80367d6a..1f152abac 100644 --- a/.github/workflows/k8s.yaml +++ b/.github/workflows/k8s.yaml @@ -62,10 +62,6 @@ jobs: # Helm Diff - name: install dependencies run: | - # Install jq - sudo wget https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux-amd64 -O /usr/bin/jq - sudo chmod +x /usr/bin/jq - # Install yq sudo wget https://github.com/mikefarah/yq/releases/download/v4.43.1/yq_linux_amd64 -O /usr/bin/yq sudo chmod +x /usr/bin/yq @@ -102,6 +98,9 @@ jobs: eval $command | yq "sort_keys(..)" >> /tmp/manifests-head.yaml done + sed -e "s/^\s*helm\.sh\/chart:\s+(.+)$//g" -i /tmp/manifests-head.yaml + sed -e "s/^\s*app\.kubernetes\.io\/version\:\s+(.+)$//g" -i /tmp/manifests-head.yaml + length=$(cat /tmp/helmreleases-base.json | jq -s length) for i in $( seq 0 $(($length - 1)) ); do cat /tmp/helmreleases-base.json | jq -rs ".[$i] | .spec.values" | tee values.json >> /dev/null @@ -109,6 +108,9 @@ jobs: eval $command | yq "sort_keys(..)" >> /tmp/manifests-base.yaml done + sed -e "s/^\s*helm\.sh\/chart:\s+(.+)$//g" -i /tmp/manifests-base.yaml + sed -e "s/^\s*app\.kubernetes\.io\/version\:\s+(.+)$//g" -i /tmp/manifests-base.yaml + - name: Upload file status_job02.txt as an artifact uses: actions/upload-artifact@v4 with: