Merge pull request #872 from fluxcd/go-1.21

Update Go to 1.21
fluxcd · Jan 23, 2024 · df80488 · df80488
2 parents 610f6e6 + d442ea3
commit df80488
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 8 deletions.
diff --git a/.github/workflows/cifuzz.yaml b/.github/workflows/cifuzz.yaml
@@ -17,7 +17,7 @@ jobs:
     - name: Setup Go
       uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
       with:
-        go-version: 1.20.x
+        go-version: 1.21.x
         cache-dependency-path: |
           **/go.sum
           **/go.mod

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -34,7 +34,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
         with:
-          go-version: 1.20.x
+          go-version: 1.21.x
           cache-dependency-path: |
             **/go.sum
             **/go.mod

diff --git a/.github/workflows/scan.yaml b/.github/workflows/scan.yaml
@@ -34,7 +34,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
         with:
-          go-version: 1.20.x
+          go-version: 1.21.x
           cache-dependency-path: |
             **/go.sum
             **/go.mod

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.20
+ARG GO_VERSION=1.21
 ARG XX_VERSION=1.3.0
 
 FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx

diff --git a/Makefile b/Makefile
@@ -97,7 +97,7 @@ api-docs: gen-crd-api-reference-docs
 # Run go mod tidy
 tidy:
 	cd api; rm -f go.sum; go mod tidy -compat=1.20
-	rm -f go.sum; go mod tidy -compat=1.20
+	rm -f go.sum; go mod tidy -compat=1.21
 
 # Run go fmt against code
 fmt:

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/fluxcd/helm-controller
 
-go 1.20
+go 1.21
 
 replace github.com/fluxcd/helm-controller/api => ./api
 

diff --git a/go.sum b/go.sum
diff --git a/tests/fuzz/Dockerfile.builder b/tests/fuzz/Dockerfile.builder
@@ -1,9 +1,9 @@
 FROM gcr.io/oss-fuzz-base/base-builder-go
 
-RUN wget https://go.dev/dl/go1.20.5.linux-amd64.tar.gz \
+RUN wget https://go.dev/dl/go1.21.6.linux-amd64.tar.gz \
     && mkdir temp-go \
     && rm -rf /root/.go/* \
-    && tar -C temp-go/ -xzf go1.20.5.linux-amd64.tar.gz \
+    && tar -C temp-go/ -xzf go1.21.6.linux-amd64.tar.gz \
     && mv temp-go/go/* /root/.go/
 
 ENV SRC=$GOPATH/src/github.com/fluxcd/helm-controller