From d94fc97735bbd770a0f0c729d14bfbe3d838436d Mon Sep 17 00:00:00 2001 From: Laszlo Uveges Date: Mon, 20 Jun 2022 17:40:03 +0200 Subject: [PATCH] Replace kubeval with kubeconform The kubeval tool does not seem to be maintained anymore. --- .github/workflows/diff-preview.yaml | 10 +++++----- .github/workflows/validate.yaml | 8 ++++---- docs/appendices.md | 2 +- tools/test-all-ffb | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/diff-preview.yaml b/.github/workflows/diff-preview.yaml index 12f323bb..982bbba5 100644 --- a/.github/workflows/diff-preview.yaml +++ b/.github/workflows/diff-preview.yaml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest env: dyff_ver: 1.5.4 - kubeval_ver: 0.16.1 + kubeconform_ver: 0.4.13 steps: - run: sudo apt-get install -y yamllint - name: install dyff @@ -24,12 +24,12 @@ jobs: - run: which dyff - uses: giantswarm/install-binary-action@v1 with: - binary: kubeval - download_url: "https://github.com/instrumenta/kubeval/releases/download/v${version}/kubeval-linux-amd64.tar.gz" + binary: kubeconform + download_url: "https://github.com/yannh/kubeconform/releases/download/v${version}/kubeconform-linux-amd64.tar.gz" smoke_test: "${binary} --version" tarball_binary_path: "${binary}" - version: ${{ env.kubeval_ver }} - - run: which kubeval + version: ${{ env.kubeconform_ver }} + - run: which kubeconform - run: ls -la /opt/hostedtoolcache - uses: actions/checkout@v3 - name: template all for the new branch diff --git a/.github/workflows/validate.yaml b/.github/workflows/validate.yaml index 0d9f9559..87327a1c 100644 --- a/.github/workflows/validate.yaml +++ b/.github/workflows/validate.yaml @@ -22,16 +22,16 @@ jobs: needs: pre-commit runs-on: ubuntu-latest env: - kubeval_ver: 0.16.1 + kubeconform_ver: 0.4.13 steps: - run: sudo apt-get install -y yamllint - uses: giantswarm/install-binary-action@v1 with: - binary: kubeval - download_url: "https://github.com/instrumenta/kubeval/releases/download/v${version}/kubeval-linux-amd64.tar.gz" + binary: kubeconform + download_url: "https://github.com/yannh/kubeconform/releases/download/v${version}/kubeconform-linux-amd64.tar.gz" smoke_test: "${binary} --version" tarball_binary_path: "${binary}" - version: ${{ env.kubeval_ver }} + version: ${{ env.kubeconform_ver }} - name: cache validation tools uses: actions/cache@v3 with: diff --git a/docs/appendices.md b/docs/appendices.md index 45bba2ae..c2b45b4e 100644 --- a/docs/appendices.md +++ b/docs/appendices.md @@ -22,4 +22,4 @@ For `yq` the [github.com/mikefarah/yq](https://github.com/mikefarah/yq/) version You need the following tools installed to use [test-all-ffb](/tools/test-all-ffb) script. - `yamllint` of [github.com/adrienverge/yamllint](https://github.com/adrienverge/yamllint) -- `kubeval` of [github.com/instrumenta/kubeval](https://github.com/instrumenta/kubeval) +- `kubeconform` of [github.com/yannh/kubeconform](https://github.com/yannh/kubeconform) diff --git a/tools/test-all-ffb b/tools/test-all-ffb index 81490c65..0d65bb58 100755 --- a/tools/test-all-ffb +++ b/tools/test-all-ffb @@ -39,8 +39,8 @@ test() { echo "Testing: $mc_name $org_name $wc_name $dir_name" echo -n "yamllint: " ./tools/fake-flux-build build "$mc_name" "$org_name" "$wc_name" "$dir_name" | yamllint - && echo "OK" - echo "kubeval: " - ./tools/fake-flux-build build "$mc_name" "$org_name" "$wc_name" "$dir_name" | kubeval --ignore-missing-schemas + echo "kubeconform: " + ./tools/fake-flux-build build "$mc_name" "$org_name" "$wc_name" "$dir_name" | kubeconform -ignore-missing-schemas -output text | sed s/stdin\ -\ //g echo "" else echo "---"