Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Align go.mod version with Kubernetes (Go 1.20) #595

Merged
merged 1 commit into from
Jun 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 0 additions & 22 deletions .github/actions/run-tests/Dockerfile

This file was deleted.

12 changes: 0 additions & 12 deletions .github/actions/run-tests/action.yml

This file was deleted.

2 changes: 1 addition & 1 deletion apis/acl/go.mod
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module github.com/fluxcd/pkg/apis/acl

go 1.18
go 1.20
2 changes: 1 addition & 1 deletion apis/event/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/fluxcd/pkg/apis/event

go 1.18
go 1.20

require (
k8s.io/api v0.27.3
Expand Down
2 changes: 1 addition & 1 deletion apis/kustomize/go.mod
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion apis/meta/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/fluxcd/pkg/apis/meta

go 1.18
go 1.20

require k8s.io/apimachinery v0.27.3

Expand Down
2 changes: 1 addition & 1 deletion git/go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion git/gogit/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/fluxcd/pkg/git/gogit

go 1.19
go 1.20

replace (
github.com/fluxcd/pkg/git => ../../git
Expand Down
2 changes: 1 addition & 1 deletion git/internal/e2e/go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion gittestserver/go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion helmtestserver/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/fluxcd/pkg/helmtestserver

go 1.18
go 1.20

replace github.com/fluxcd/pkg/testserver => ../testserver

Expand Down
2 changes: 1 addition & 1 deletion http/fetch/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/fluxcd/pkg/http/fetch

go 1.18
go 1.20

replace (
github.com/fluxcd/pkg/tar => ../../tar
Expand Down
2 changes: 1 addition & 1 deletion http/transport/go.mod
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module github.com/fluxcd/pkg/http/transport

go 1.18
go 1.20
2 changes: 1 addition & 1 deletion kustomize/go.mod
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion lockedfile/go.mod
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module github.com/fluxcd/pkg/lockedfile

go 1.18
go 1.20
2 changes: 1 addition & 1 deletion masktoken/go.mod
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module github.com/fluxcd/pkg/masktoken

go 1.18
go 1.20
2 changes: 1 addition & 1 deletion oci/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/fluxcd/pkg/oci

go 1.18
go 1.20

replace (
github.com/fluxcd/pkg/sourceignore => ../sourceignore
Expand Down
2 changes: 1 addition & 1 deletion oci/tests/integration/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/fluxcd/pkg/oci/tests/integration

go 1.18
go 1.20

replace github.com/fluxcd/pkg/oci => ../../

Expand Down
2 changes: 1 addition & 1 deletion runtime/go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion sourceignore/go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion ssa/go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion ssh/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/fluxcd/pkg/ssh

go 1.18
go 1.20

require (
github.com/onsi/gomega v1.27.8
Expand Down
2 changes: 1 addition & 1 deletion tar/go.mod
Original file line number Diff line number Diff line change
@@ -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
6 changes: 6 additions & 0 deletions tests/fuzz/Dockerfile.builder
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion testserver/go.mod
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module github.com/fluxcd/pkg/testserver

go 1.18
go 1.20
2 changes: 1 addition & 1 deletion untar/go.mod
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion version/go.mod
Original file line number Diff line number Diff line change
@@ -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