From 0e503866b60c4b4141298f5720074815ee23c2b7 Mon Sep 17 00:00:00 2001 From: Devanshu Date: Tue, 3 Sep 2024 16:03:25 +0530 Subject: [PATCH 1/2] Bump go version to 1.22.5 Signed-off-by: Devanshu --- .github/workflows/gh-test-external-registry.yml | 2 +- .github/workflows/gh-test.yml | 4 ++-- .github/workflows/golangci-lint.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/trivy-scan.yml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/gh-test-external-registry.yml b/.github/workflows/gh-test-external-registry.yml index b569e785b..d13001e3b 100644 --- a/.github/workflows/gh-test-external-registry.yml +++ b/.github/workflows/gh-test-external-registry.yml @@ -26,7 +26,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v3 with: - go-version: "1.22.4" + go-version: "1.22.5" - name: Check out code into the Go module directory uses: actions/checkout@v2 with: diff --git a/.github/workflows/gh-test.yml b/.github/workflows/gh-test.yml index 67bbe4294..b804dd8ca 100644 --- a/.github/workflows/gh-test.yml +++ b/.github/workflows/gh-test.yml @@ -14,7 +14,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v3 with: - go-version: "1.22.4" + go-version: "1.22.5" - name: Check out code into the Go module directory uses: actions/checkout@v2 with: @@ -37,7 +37,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v3 with: - go-version: "1.22.4" + go-version: "1.22.5" - name: Check out code into the Go module directory uses: actions/checkout@v2 with: diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index dde68d1b3..075fd6fba 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -15,7 +15,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v3 with: - go-version: "1.22.4" + go-version: "1.22.5" - uses: actions/checkout@v2 with: fetch-depth: '0' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c8a9e9868..2ba84d192 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,7 +19,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: 1.22.4 + go-version: 1.22.5 - name: Set up Cosign uses: sigstore/cosign-installer@v3 - name: Retrieve version diff --git a/.github/workflows/trivy-scan.yml b/.github/workflows/trivy-scan.yml index 5c60bdfad..2f5649923 100644 --- a/.github/workflows/trivy-scan.yml +++ b/.github/workflows/trivy-scan.yml @@ -10,7 +10,7 @@ jobs: with: repo: carvel-dev/imgpkg tool: imgpkg - goVersion: 1.22.4 + goVersion: 1.22.5 secrets: githubToken: ${{ secrets.GITHUB_TOKEN }} slackWebhookURL: ${{ secrets.SLACK_WEBHOOK_URL }} From 607b557d5e5235320a19b509122be1336fd034b9 Mon Sep 17 00:00:00 2001 From: Devanshu Date: Tue, 3 Sep 2024 16:23:47 +0530 Subject: [PATCH 2/2] Fix perf test failure for capi-nginx image Signed-off-by: Devanshu --- test/perf/assets/cf-for-k8s-bundle/.imgpkg/images.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/perf/assets/cf-for-k8s-bundle/.imgpkg/images.yml b/test/perf/assets/cf-for-k8s-bundle/.imgpkg/images.yml index cb720a1a9..52fb41719 100644 --- a/test/perf/assets/cf-for-k8s-bundle/.imgpkg/images.yml +++ b/test/perf/assets/cf-for-k8s-bundle/.imgpkg/images.yml @@ -2,8 +2,8 @@ apiVersion: imgpkg.carvel.dev/v1alpha1 images: - annotations: - kbld.carvel.dev/id: cloudfoundry/capi-nginx@sha256:67ad232b390a100a3c9e9b36ee1c6443843185e6df78f3fba57f9a708808b6da - image: index.docker.io/cloudfoundry/capi-nginx@sha256:67ad232b390a100a3c9e9b36ee1c6443843185e6df78f3fba57f9a708808b6da + kbld.carvel.dev/id: cloudfoundry/cli@sha256:efe972e71abe4f01b73da8475b69bf46106faf31f7bc0a0615fb843c2d98c4b6 + image: index.docker.io/cloudfoundry/cli@sha256:efe972e71abe4f01b73da8475b69bf46106faf31f7bc0a0615fb843c2d98c4b6 - annotations: kbld.carvel.dev/id: cloudfoundry/cf-api-backup-metadata-generator@sha256:0f3098d99b35bfb9608b580323e0cc454bd254afaf08cd02acec58af770fea4f image: index.docker.io/cloudfoundry/cf-api-backup-metadata-generator@sha256:0f3098d99b35bfb9608b580323e0cc454bd254afaf08cd02acec58af770fea4f