From afcab0bda55c17a33a29741726f61dad70e31aa1 Mon Sep 17 00:00:00 2001 From: Slach Date: Wed, 27 Dec 2023 12:03:29 +0500 Subject: [PATCH 1/8] fixes after https://github.com/kubernetes-sigs/krew-index/pull/3557 --- .krew/tail.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.krew/tail.yaml b/.krew/tail.yaml index 5884692..7e18430 100644 --- a/.krew/tail.yaml +++ b/.krew/tail.yaml @@ -54,7 +54,7 @@ spec: matchLabels: os: windows arch: arm64 - bin: kail + bin: kail.exe files: - from: "kail.exe" to: "." @@ -65,7 +65,7 @@ spec: matchLabels: os: windows arch: amd64 - bin: kail + bin: kail.exe files: - from: "kail.exe" to: "." From bf7c0d77ec955b15fbec2cb8d2f950ced26847cf Mon Sep 17 00:00:00 2001 From: Slach Date: Wed, 27 Dec 2023 12:17:47 +0500 Subject: [PATCH 2/8] update krew-release-bot to 0.0.46 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 50734bf..b76da96 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,6 +38,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} HOMEBREW_TAP_GITHUB_TOKEN: ${{ secrets.HOMEBREW_TAP_GITHUB_TOKEN }} - name: Update krew-index - uses: rajatjindal/krew-release-bot@v0.0.43 + uses: rajatjindal/krew-release-bot@v0.0.46 with: krew_template_file: .krew/tail.yaml From 1f020e0c4a0c2ebb8db13037284c7b4caa00ba0b Mon Sep 17 00:00:00 2001 From: Slach Date: Wed, 27 Dec 2023 13:00:03 +0500 Subject: [PATCH 3/8] add Validate krew-index manifest --- .github/workflows/test.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d3ed7b5..90ee4c6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -21,3 +21,9 @@ jobs: go-version-file: go.mod cache: true - run: go test -v ./... + - name: Validate krew-index manifest + run: | + go install sigs.k8s.io/krew/cmd/validate-krew-manifest@latest + docker run --rm -v ./.krew/tail.yaml:/tmp/template-file.yaml ghcr.io/rajatjindal/krew-release-bot:latest krew-release-bot template --tag $(git describe --abbrev=0 --tags) --template-file /tmp/template-file.yaml 1>/tmp/tail.yaml + ~/go/bin/validate-krew-manifest -manifest /tmp/tail.yaml + From ad454bb9a8abc70e88e8e96f4e50025205ef7506 Mon Sep 17 00:00:00 2001 From: Slach Date: Wed, 27 Dec 2023 13:12:20 +0500 Subject: [PATCH 4/8] fixes for Validate krew-index manifest --- .github/workflows/test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 90ee4c6..ab64de6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,7 +23,8 @@ jobs: - run: go test -v ./... - name: Validate krew-index manifest run: | + TAG=$(curl -sL https://github.com/boz/kail/releases/latest -H "Accept: application/json" | jq -r .tag_name) go install sigs.k8s.io/krew/cmd/validate-krew-manifest@latest - docker run --rm -v ./.krew/tail.yaml:/tmp/template-file.yaml ghcr.io/rajatjindal/krew-release-bot:latest krew-release-bot template --tag $(git describe --abbrev=0 --tags) --template-file /tmp/template-file.yaml 1>/tmp/tail.yaml + docker run --rm -v ./.krew/tail.yaml:/tmp/template-file.yaml ghcr.io/rajatjindal/krew-release-bot:latest krew-release-bot template --tag ${TAG} --template-file /tmp/template-file.yaml 1>/tmp/tail.yaml ~/go/bin/validate-krew-manifest -manifest /tmp/tail.yaml From 47d0be518588d66d8ac710eac124100db77d9cb8 Mon Sep 17 00:00:00 2001 From: Slach Date: Wed, 27 Dec 2023 13:18:38 +0500 Subject: [PATCH 5/8] add krew install --- .github/workflows/test.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ab64de6..e36272e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,6 +23,13 @@ jobs: - run: go test -v ./... - name: Validate krew-index manifest run: | + set -euo pipefail + KREW_VERSION=v0.4.4 + cd "$(mktemp -d)" + curl -fsSLO "https://github.com/kubernetes-sigs/krew/releases/download/${KREW_VERSION}/krew.yaml" + curl -fsSLO "https://github.com/kubernetes-sigs/krew/releases/download/${KREW_VERSION}/krew-linux_amd64.tar.gz" + tar zxvf krew-linux_amd64.tar.gz + ./krew-linux_amd64 install --manifest=krew.yaml --archive=krew-linux_amd64.tar.gz TAG=$(curl -sL https://github.com/boz/kail/releases/latest -H "Accept: application/json" | jq -r .tag_name) go install sigs.k8s.io/krew/cmd/validate-krew-manifest@latest docker run --rm -v ./.krew/tail.yaml:/tmp/template-file.yaml ghcr.io/rajatjindal/krew-release-bot:latest krew-release-bot template --tag ${TAG} --template-file /tmp/template-file.yaml 1>/tmp/tail.yaml From 90c8eba8c6d86851fde320fb28e5bb35da2aabd4 Mon Sep 17 00:00:00 2001 From: Slach Date: Wed, 27 Dec 2023 13:25:31 +0500 Subject: [PATCH 6/8] debug --- .github/workflows/test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e36272e..4d6071e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,6 +23,8 @@ jobs: - run: go test -v ./... - name: Validate krew-index manifest run: | + pwd + ls -la ./ set -euo pipefail KREW_VERSION=v0.4.4 cd "$(mktemp -d)" From 6c9db09d69c7d3ff0fc970438d61570cf04fb7af Mon Sep 17 00:00:00 2001 From: Slach Date: Wed, 27 Dec 2023 13:30:11 +0500 Subject: [PATCH 7/8] fixes for directory changing --- .github/workflows/test.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4d6071e..a8838d9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,17 +23,17 @@ jobs: - run: go test -v ./... - name: Validate krew-index manifest run: | - pwd - ls -la ./ set -euo pipefail KREW_VERSION=v0.4.4 - cd "$(mktemp -d)" + pushd "$(mktemp -d)" curl -fsSLO "https://github.com/kubernetes-sigs/krew/releases/download/${KREW_VERSION}/krew.yaml" curl -fsSLO "https://github.com/kubernetes-sigs/krew/releases/download/${KREW_VERSION}/krew-linux_amd64.tar.gz" tar zxvf krew-linux_amd64.tar.gz - ./krew-linux_amd64 install --manifest=krew.yaml --archive=krew-linux_amd64.tar.gz + ./krew-linux_amd64 install --manifest=krew.yaml --archive=krew-linux_amd64.tar.gz + popd TAG=$(curl -sL https://github.com/boz/kail/releases/latest -H "Accept: application/json" | jq -r .tag_name) - go install sigs.k8s.io/krew/cmd/validate-krew-manifest@latest + ls -la ./.krew/tail.yaml docker run --rm -v ./.krew/tail.yaml:/tmp/template-file.yaml ghcr.io/rajatjindal/krew-release-bot:latest krew-release-bot template --tag ${TAG} --template-file /tmp/template-file.yaml 1>/tmp/tail.yaml + go install sigs.k8s.io/krew/cmd/validate-krew-manifest@latest ~/go/bin/validate-krew-manifest -manifest /tmp/tail.yaml From bf06a7920e2a2b1c543ab2cf5bdcfd6fbe3f1323 Mon Sep 17 00:00:00 2001 From: Slach Date: Wed, 27 Dec 2023 13:32:34 +0500 Subject: [PATCH 8/8] PATH changing to use krew --- .github/workflows/test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a8838d9..f6de359 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -31,7 +31,8 @@ jobs: tar zxvf krew-linux_amd64.tar.gz ./krew-linux_amd64 install --manifest=krew.yaml --archive=krew-linux_amd64.tar.gz popd - TAG=$(curl -sL https://github.com/boz/kail/releases/latest -H "Accept: application/json" | jq -r .tag_name) + export PATH="${KREW_ROOT:-$HOME/.krew}/bin:$PATH" + export TAG=$(curl -sL https://github.com/boz/kail/releases/latest -H "Accept: application/json" | jq -r .tag_name) ls -la ./.krew/tail.yaml docker run --rm -v ./.krew/tail.yaml:/tmp/template-file.yaml ghcr.io/rajatjindal/krew-release-bot:latest krew-release-bot template --tag ${TAG} --template-file /tmp/template-file.yaml 1>/tmp/tail.yaml go install sigs.k8s.io/krew/cmd/validate-krew-manifest@latest