From 6dce50268fac730efd30d948ca38b2232521f82e Mon Sep 17 00:00:00 2001 From: jiangpengcheng Date: Sat, 11 May 2024 10:55:29 +0800 Subject: [PATCH] Bump go to 1.22.3 to fix CVE-2024-24788 --- .github/workflows/bundle-release.yml | 8 ++++---- .github/workflows/olm-verify.yml | 4 ++-- .github/workflows/project.yml | 2 +- .github/workflows/release.yml | 4 ++-- .github/workflows/test-helm-charts.yml | 4 ++-- .github/workflows/trivy.yml | 4 ++-- Dockerfile | 2 +- redhat.Dockerfile | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/bundle-release.yml b/.github/workflows/bundle-release.yml index e46f7f38..59c73f28 100644 --- a/.github/workflows/bundle-release.yml +++ b/.github/workflows/bundle-release.yml @@ -42,10 +42,10 @@ jobs: username: ${{ secrets.DOCKER_USER }} password: ${{ secrets.DOCKER_PASSWORD }} - - name: Set up GO 1.22.2 + - name: Set up GO 1.22.3 uses: actions/setup-go@v1 with: - go-version: 1.22.2 + go-version: 1.22.3 id: go - name: InstallKubebuilder @@ -166,10 +166,10 @@ jobs: username: ${{ secrets.DOCKER_USER }} password: ${{ secrets.DOCKER_PASSWORD }} - - name: Set up GO 1.22.2 + - name: Set up GO 1.22.3 uses: actions/setup-go@v1 with: - go-version: 1.22.2 + go-version: 1.22.3 id: go - name: InstallKubebuilder diff --git a/.github/workflows/olm-verify.yml b/.github/workflows/olm-verify.yml index 3ef7cfea..3d0fb171 100644 --- a/.github/workflows/olm-verify.yml +++ b/.github/workflows/olm-verify.yml @@ -27,10 +27,10 @@ jobs: - name: checkout uses: actions/checkout@v2 - - name: Set up GO 1.22.2 + - name: Set up GO 1.22.3 uses: actions/setup-go@v1 with: - go-version: 1.22.2 + go-version: 1.22.3 id: go - name: InstallKubebuilder diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml index 3dfc99bf..738d7135 100644 --- a/.github/workflows/project.yml +++ b/.github/workflows/project.yml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - go-version: [1.21.9, 1.22.2] + go-version: [1.21.9, 1.22.3] steps: - name: clean disk run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 960d9038..ba515b75 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -30,10 +30,10 @@ jobs: username: ${{ secrets.DOCKER_USER }} password: ${{ secrets.DOCKER_PASSWORD }} - - name: Set up GO 1.22.2 + - name: Set up GO 1.22.3 uses: actions/setup-go@v1 with: - go-version: 1.22.2 + go-version: 1.22.3 id: go - name: InstallKubebuilder diff --git a/.github/workflows/test-helm-charts.yml b/.github/workflows/test-helm-charts.yml index 8c3990c8..1a015729 100644 --- a/.github/workflows/test-helm-charts.yml +++ b/.github/workflows/test-helm-charts.yml @@ -76,11 +76,11 @@ jobs: run: hack/kind-cluster-build.sh --name chart-testing -c 1 -v 10 --k8sVersion v1.23.17 if: steps.list-changed.outputs.changed == 'true' - - name: Set up GO 1.22.2 + - name: Set up GO 1.22.3 if: steps.list-changed.outputs.changed == 'true' uses: actions/setup-go@v1 with: - go-version: 1.22.2 + go-version: 1.22.3 id: go - name: setup kubebuilder 3.6.0 diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml index 1352c83b..f21bb3fb 100644 --- a/.github/workflows/trivy.yml +++ b/.github/workflows/trivy.yml @@ -23,10 +23,10 @@ jobs: repository: ${{github.event.pull_request.head.repo.full_name}} ref: ${{ github.event.pull_request.head.sha }} - - name: Set up GO 1.22.2 + - name: Set up GO 1.22.3 uses: actions/setup-go@v1 with: - go-version: 1.22.2 + go-version: 1.22.3 id: go - name: InstallKubebuilder diff --git a/Dockerfile b/Dockerfile index eab061f5..49c673c8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM golang:1.22.2-bullseye as builder +FROM golang:1.22.3-bullseye as builder WORKDIR /workspace # Copy the Go Modules manifests diff --git a/redhat.Dockerfile b/redhat.Dockerfile index 1498f7c3..fa2bf6ef 100644 --- a/redhat.Dockerfile +++ b/redhat.Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM golang:1.22.2-bullseye as builder +FROM golang:1.22.3-bullseye as builder WORKDIR /workspace # Copy the Go Modules manifests