From d1003b94d5f1e63878f746c819f92a256989f9bd Mon Sep 17 00:00:00 2001 From: cpanato Date: Mon, 23 May 2022 10:21:47 +0200 Subject: [PATCH 1/2] updates for helm, kubectl, goreleaser, syft, cosign and kind Signed-off-by: cpanato --- .github/workflows/ci.yaml | 4 ++-- Dockerfile | 4 ++-- setup.sh | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index fd2d4f53..844955c2 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -27,7 +27,7 @@ jobs: - uses: azure/setup-helm@18bc76811624f360dbd7f18c2d4ecb32c7b87bab # v1.1 with: - version: v3.8.2 + version: v3.9.0 - name: Install tools run: | @@ -35,7 +35,7 @@ jobs: chmod +x ./kubectl sudo mv ./kubectl /usr/local/bin/kubectl - curl -fsSLo kind "https://github.com/kubernetes-sigs/kind/releases/download/v0.12.0/kind-linux-amd64" + curl -fsSLo kind "https://github.com/kubernetes-sigs/kind/releases/download/v0.14.0/kind-linux-amd64" chmod +x kind sudo mv kind /usr/local/bin/kind diff --git a/Dockerfile b/Dockerfile index 3706d82f..4269a280 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,14 +23,14 @@ RUN pip install "yamale==$yamale_version" ARG TARGETPLATFORM # Install kubectl -ARG kubectl_version=v1.22.5 +ARG kubectl_version=v1.23.6 LABEL kubectl_version=$kubectl_version RUN curl -LO "https://storage.googleapis.com/kubernetes-release/release/$kubectl_version/bin/$TARGETPLATFORM/kubectl" && \ chmod +x kubectl && \ mv kubectl /usr/local/bin/ # Install Helm -ARG helm_version=v3.8.1 +ARG helm_version=v3.9.0 LABEL helm_version=$helm_version RUN targetArch=$(echo $TARGETPLATFORM | cut -f2 -d '/') \ && if [ ${targetArch} = "amd64" ]; then \ diff --git a/setup.sh b/setup.sh index 5d7c7da6..ea3d7da0 100755 --- a/setup.sh +++ b/setup.sh @@ -16,7 +16,7 @@ set -o errexit -go install github.com/goreleaser/goreleaser@v1.8.2 +go install github.com/goreleaser/goreleaser@v1.9.1 go install golang.org/x/tools/cmd/goimports@latest -go install github.com/sigstore/cosign/cmd/cosign@v1.7.2 -go install github.com/anchore/syft@v0.44.1 +go install github.com/sigstore/cosign/cmd/cosign@v1.8.0 +go install github.com/anchore/syft@v0.46.1 From 39cab3d5401080b7fd7fe90528b14e81b710736d Mon Sep 17 00:00:00 2001 From: cpanato Date: Mon, 23 May 2022 10:30:38 +0200 Subject: [PATCH 2/2] refactor ci/release install tools Signed-off-by: cpanato --- .github/workflows/ci.yaml | 11 +++++++++++ .github/workflows/release.yaml | 11 +++++++++++ setup.sh | 3 --- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 844955c2..a6ef5041 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -29,6 +29,17 @@ jobs: with: version: v3.9.0 + - name: Install GoReleaser + uses: goreleaser/goreleaser-action@68acf3b1adf004ac9c2f0a4259e85c5f66e99bef # v3.0.0 + with: + install-only: true + + - name: Install cosign + uses: sigstore/cosign-installer@536b37ec5d5b543420bdfd9b744c5965bd4d8730 # v2.3.0 + + - name: Install syft + uses: anchore/sbom-action/download-syft@bb716408e75840bbb01e839347cd213767269d4a # v0.11.0 + - name: Install tools run: | curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index bd3af1ff..d324e93a 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -30,6 +30,17 @@ jobs: go-version: '1.18' check-latest: true + - name: Install GoReleaser + uses: goreleaser/goreleaser-action@68acf3b1adf004ac9c2f0a4259e85c5f66e99bef # v3.0.0 + with: + install-only: true + + - name: Install cosign + uses: sigstore/cosign-installer@536b37ec5d5b543420bdfd9b744c5965bd4d8730 # v2.3.0 + + - name: Install syft + uses: anchore/sbom-action/download-syft@bb716408e75840bbb01e839347cd213767269d4a # v0.11.0 + - name: Install tools run: | ./setup.sh diff --git a/setup.sh b/setup.sh index ea3d7da0..2b5e1a34 100755 --- a/setup.sh +++ b/setup.sh @@ -16,7 +16,4 @@ set -o errexit -go install github.com/goreleaser/goreleaser@v1.9.1 go install golang.org/x/tools/cmd/goimports@latest -go install github.com/sigstore/cosign/cmd/cosign@v1.8.0 -go install github.com/anchore/syft@v0.46.1