Merge pull request #595 from fluxcd/go.mod-1.20

Align `go.mod` version with Kubernetes (Go 1.20)
fluxcd · Jun 27, 2023 · 938e322 · 938e322
2 parents 4443dd8 + 111ee3b
commit 938e322
Show file tree

Hide file tree

Showing 27 changed files with 30 additions and 58 deletions.
diff --git a/.github/actions/run-tests/Dockerfile b/.github/actions/run-tests/Dockerfile
diff --git a/.github/actions/run-tests/action.yml b/.github/actions/run-tests/action.yml
diff --git a/apis/acl/go.mod b/apis/acl/go.mod
@@ -1,3 +1,3 @@
 module github.com/fluxcd/pkg/apis/acl
 
-go 1.18
+go 1.20
diff --git a/apis/event/go.mod b/apis/event/go.mod
@@ -1,6 +1,6 @@
 module github.com/fluxcd/pkg/apis/event
 
-go 1.18
+go 1.20
 
 require (
 	k8s.io/api v0.27.3

diff --git a/apis/kustomize/go.mod b/apis/kustomize/go.mod
@@ -1,6 +1,6 @@
 module github.com/fluxcd/pkg/apis/kustomize
 
-go 1.18
+go 1.20
 
 require k8s.io/apiextensions-apiserver v0.27.3
 

diff --git a/apis/meta/go.mod b/apis/meta/go.mod
@@ -1,6 +1,6 @@
 module github.com/fluxcd/pkg/apis/meta
 
-go 1.18
+go 1.20
 
 require k8s.io/apimachinery v0.27.3
 

diff --git a/git/go.mod b/git/go.mod
@@ -1,6 +1,6 @@
 module github.com/fluxcd/pkg/git
 
-go 1.19
+go 1.20
 
 require (
 	// github.com/ProtonMail/go-crypto is a fork of golang.org/x/crypto

diff --git a/git/gogit/go.mod b/git/gogit/go.mod
@@ -1,6 +1,6 @@
 module github.com/fluxcd/pkg/git/gogit
 
-go 1.19
+go 1.20
 
 replace (
 	github.com/fluxcd/pkg/git => ../../git

diff --git a/git/internal/e2e/go.mod b/git/internal/e2e/go.mod
@@ -1,6 +1,6 @@
 module github.com/fluxcd/pkg/git/internal/e2e
 
-go 1.19
+go 1.20
 
 replace (
 	github.com/fluxcd/pkg/git => ../../../git

diff --git a/gittestserver/go.mod b/gittestserver/go.mod
@@ -1,6 +1,6 @@
 module github.com/fluxcd/pkg/gittestserver
 
-go 1.18
+go 1.20
 
 require (
 	github.com/cyphar/filepath-securejoin v0.2.3

diff --git a/helmtestserver/go.mod b/helmtestserver/go.mod
@@ -1,6 +1,6 @@
 module github.com/fluxcd/pkg/helmtestserver
 
-go 1.18
+go 1.20
 
 replace github.com/fluxcd/pkg/testserver => ../testserver
 

diff --git a/http/fetch/go.mod b/http/fetch/go.mod
@@ -1,6 +1,6 @@
 module github.com/fluxcd/pkg/http/fetch
 
-go 1.18
+go 1.20
 
 replace (
 	github.com/fluxcd/pkg/tar => ../../tar

diff --git a/http/transport/go.mod b/http/transport/go.mod
@@ -1,3 +1,3 @@
 module github.com/fluxcd/pkg/http/transport
 
-go 1.18
+go 1.20
diff --git a/kustomize/go.mod b/kustomize/go.mod
@@ -1,6 +1,6 @@
 module github.com/fluxcd/pkg/kustomize
 
-go 1.18
+go 1.20
 
 replace github.com/fluxcd/pkg/apis/kustomize => ../apis/kustomize
 

diff --git a/lockedfile/go.mod b/lockedfile/go.mod
@@ -1,3 +1,3 @@
 module github.com/fluxcd/pkg/lockedfile
 
-go 1.18
+go 1.20
diff --git a/masktoken/go.mod b/masktoken/go.mod
@@ -1,3 +1,3 @@
 module github.com/fluxcd/pkg/masktoken
 
-go 1.18
+go 1.20
diff --git a/oci/go.mod b/oci/go.mod
@@ -1,6 +1,6 @@
 module github.com/fluxcd/pkg/oci
 
-go 1.18
+go 1.20
 
 replace (
 	github.com/fluxcd/pkg/sourceignore => ../sourceignore

diff --git a/oci/tests/integration/go.mod b/oci/tests/integration/go.mod
@@ -1,6 +1,6 @@
 module github.com/fluxcd/pkg/oci/tests/integration
 
-go 1.18
+go 1.20
 
 replace github.com/fluxcd/pkg/oci => ../../
 

diff --git a/runtime/go.mod b/runtime/go.mod
@@ -1,6 +1,6 @@
 module github.com/fluxcd/pkg/runtime
 
-go 1.18
+go 1.20
 
 replace (
 	github.com/fluxcd/pkg/apis/acl => ../apis/acl

diff --git a/sourceignore/go.mod b/sourceignore/go.mod
@@ -1,6 +1,6 @@
 module github.com/fluxcd/pkg/sourceignore
 
-go 1.18
+go 1.20
 
 require (
 	github.com/go-git/go-git/v5 v5.7.0

diff --git a/ssa/go.mod b/ssa/go.mod
@@ -1,6 +1,6 @@
 module github.com/fluxcd/pkg/ssa
 
-go 1.18
+go 1.20
 
 require (
 	github.com/google/go-cmp v0.5.9

diff --git a/ssh/go.mod b/ssh/go.mod
@@ -1,6 +1,6 @@
 module github.com/fluxcd/pkg/ssh
 
-go 1.18
+go 1.20
 
 require (
 	github.com/onsi/gomega v1.27.8

diff --git a/tar/go.mod b/tar/go.mod
@@ -1,5 +1,5 @@
 module github.com/fluxcd/pkg/tar
 
-go 1.18
+go 1.20
 
 require github.com/cyphar/filepath-securejoin v0.2.3
diff --git a/tests/fuzz/Dockerfile.builder b/tests/fuzz/Dockerfile.builder
@@ -1,5 +1,11 @@
 FROM gcr.io/oss-fuzz-base/base-builder-go
 
+RUN wget https://go.dev/dl/go1.20.5.linux-amd64.tar.gz \
+    && mkdir temp-go \
+    && rm -rf /root/.go/* \
+    && tar -C temp-go/ -xzf go1.20.5.linux-amd64.tar.gz \
+    && mv temp-go/go/* /root/.go/
+
 ENV SRC=$GOPATH/src/github.com/fluxcd/pkg
 ENV FLUX_CI=true
 

diff --git a/testserver/go.mod b/testserver/go.mod
@@ -1,3 +1,3 @@
 module github.com/fluxcd/pkg/testserver
 
-go 1.18
+go 1.20
diff --git a/untar/go.mod b/untar/go.mod
@@ -1,7 +1,7 @@
 // Deprecated: use github.com/fluxcd/pkg/tar instead.
 module github.com/fluxcd/pkg/untar
 
-go 1.18
+go 1.20
 
 require github.com/fluxcd/pkg/tar v0.2.0
 

diff --git a/version/go.mod b/version/go.mod
@@ -1,5 +1,5 @@
 module github.com/fluxcd/pkg/version
 
-go 1.18
+go 1.20
 
 require github.com/Masterminds/semver/v3 v3.2.1