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.

Sign up for GitHub

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

Jump to bottom

chore: bump k8s libraries to 1.31 #619

Merged
merged 14 commits into from
Aug 23, 2024
Merged

chore: bump k8s libraries to 1.31 #619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2cba0a9
bump latest kubernetes version
sivchari May 20, 2024
ff036d8
upgrade Go version to resolve dependencies
sivchari May 20, 2024
214b954
fix: ci
sivchari May 20, 2024
49a0e8e
use Go1.22.3
sivchari May 20, 2024
1ecb05b
update from 1.29.2 to 1.30.1
sivchari May 20, 2024
bae8f68
update go.sum
sivchari May 20, 2024
c026095
upgrade golangci-lint
sivchari May 20, 2024
c5eddf1
Merge remote-tracking branch 'origin/master' into bump-k8s-1.30.1
crenshaw-dev Jul 15, 2024
c5c3421
bump to 0.30.2
crenshaw-dev Jul 15, 2024
9dea040
remove unnecessary replace
crenshaw-dev Jul 15, 2024
4bf9eb8
Merge remote-tracking branch 'origin/master' into bump-k8s-1.30.1
crenshaw-dev Aug 19, 2024
48307b8
latest patch
crenshaw-dev Aug 20, 2024
94f0867
chore: bump k8s libraries from 1.30 to 1.31
crenshaw-dev Aug 21, 2024
070c2a7
Merge remote-tracking branch 'origin/master' into bump-k8s-1.31
crenshaw-dev Aug 23, 2024
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
135 changes: 68 additions & 67 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,46 +3,46 @@ module github.com/argoproj/gitops-engine
go 1.22.0

require (
github.com/davecgh/go-spew v1.1.1
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
github.com/evanphx/json-patch v4.12.0+incompatible
github.com/go-logr/logr v1.4.1
github.com/go-logr/logr v1.4.2
github.com/golang/mock v1.6.0
github.com/google/gnostic-models v0.6.8
github.com/google/uuid v1.3.0
github.com/spf13/cobra v1.7.0
github.com/stretchr/testify v1.8.4
golang.org/x/sync v0.6.0
google.golang.org/protobuf v1.33.0
k8s.io/api v0.30.4
github.com/google/uuid v1.6.0
github.com/spf13/cobra v1.8.1
github.com/stretchr/testify v1.9.0
golang.org/x/sync v0.7.0
google.golang.org/protobuf v1.34.2
k8s.io/api v0.31.0
k8s.io/apiextensions-apiserver v0.31.2
k8s.io/apimachinery v0.30.4
k8s.io/cli-runtime v0.30.4
k8s.io/client-go v0.30.4
k8s.io/klog/v2 v2.120.1
k8s.io/apimachinery v0.31.0
k8s.io/cli-runtime v0.31.0
k8s.io/client-go v0.31.0
k8s.io/klog/v2 v2.130.1
k8s.io/kube-aggregator v0.31.2
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340
k8s.io/kubectl v0.31.2
k8s.io/kubernetes v1.30.4
k8s.io/kubernetes v1.31.0
sigs.k8s.io/structured-merge-diff/v4 v4.4.1
sigs.k8s.io/yaml v1.3.0
sigs.k8s.io/yaml v1.4.0
)

require (
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/MakeNowJust/heredoc v1.0.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/chai2010/gettext-go v1.0.2 // indirect
github.com/distribution/reference v0.5.0 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
github.com/fatih/camelcase v1.0.0 // indirect
github.com/fvbommel/sortorder v1.1.0 // indirect
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
github.com/go-errors/errors v1.4.2 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/go-openapi/swag v0.22.4 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/btree v1.0.1 // indirect
Expand All @@ -58,10 +58,9 @@ require (
github.com/json-iterator/go v1.1.12 // indirect
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
github.com/moby/spdystream v0.2.0 // indirect
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
github.com/moby/spdystream v0.4.0 // indirect
github.com/moby/term v0.5.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
Expand All @@ -70,65 +69,67 @@ require (
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.16.0 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.10.1 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_golang v1.19.1 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.55.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/stretchr/objx v0.5.0 // indirect
github.com/stretchr/objx v0.5.2 // indirect
github.com/x448/float16 v0.8.4 // indirect
github.com/xlab/treeprint v1.2.0 // indirect
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
golang.org/x/net v0.23.0 // indirect
golang.org/x/oauth2 v0.10.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/term v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/net v0.26.0 // indirect
golang.org/x/oauth2 v0.21.0 // indirect
golang.org/x/sys v0.21.0 // indirect
golang.org/x/term v0.21.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/time v0.3.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiserver v0.30.4 // indirect
k8s.io/component-base v0.30.4 // indirect
k8s.io/component-helpers v0.30.4 // indirect
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
k8s.io/apiserver v0.31.0 // indirect
k8s.io/component-base v0.31.0 // indirect
k8s.io/component-helpers v0.31.0 // indirect
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
sigs.k8s.io/kustomize/api v0.17.2 // indirect
sigs.k8s.io/kustomize/kyaml v0.17.1 // indirect
)

replace (
// After bumping these versions, run hack/update_static_schema.sh in case the schema has changed.
k8s.io/api => k8s.io/api v0.30.4
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.30.4
k8s.io/apimachinery => k8s.io/apimachinery v0.30.4
k8s.io/apiserver => k8s.io/apiserver v0.30.4
k8s.io/cli-runtime => k8s.io/cli-runtime v0.30.4
k8s.io/client-go => k8s.io/client-go v0.30.4
k8s.io/cloud-provider => k8s.io/cloud-provider v0.30.4
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.30.4
k8s.io/code-generator => k8s.io/code-generator v0.30.4
k8s.io/component-base => k8s.io/component-base v0.30.4
k8s.io/component-helpers => k8s.io/component-helpers v0.30.4
k8s.io/controller-manager => k8s.io/controller-manager v0.30.4
k8s.io/cri-api => k8s.io/cri-api v0.30.4
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.30.4
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.30.4
k8s.io/api => k8s.io/api v0.31.0
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.0
k8s.io/apimachinery => k8s.io/apimachinery v0.31.0
k8s.io/apiserver => k8s.io/apiserver v0.31.0
k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.0
k8s.io/client-go => k8s.io/client-go v0.31.0
k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.0
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.0
k8s.io/code-generator => k8s.io/code-generator v0.31.0
k8s.io/component-base => k8s.io/component-base v0.31.0
k8s.io/component-helpers => k8s.io/component-helpers v0.31.0
k8s.io/controller-manager => k8s.io/controller-manager v0.31.0
k8s.io/cri-api => k8s.io/cri-api v0.31.0
k8s.io/cri-client => k8s.io/cri-client v0.31.0
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.0
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.0
k8s.io/endpointslice => k8s.io/endpointslice v0.31.2
k8s.io/kms => k8s.io/kms v0.30.4
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.30.4
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.30.4
k8s.io/kube-proxy => k8s.io/kube-proxy v0.30.4
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.30.4
k8s.io/kubectl => k8s.io/kubectl v0.30.4
k8s.io/kubelet => k8s.io/kubelet v0.30.4
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.30.4
k8s.io/metrics => k8s.io/metrics v0.30.4
k8s.io/mount-utils => k8s.io/mount-utils v0.30.4
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.30.4
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.30.4
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.30.4
k8s.io/sample-controller => k8s.io/sample-controller v0.30.4
k8s.io/kms => k8s.io/kms v0.31.0
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.0
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.0
k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.0
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.0
k8s.io/kubectl => k8s.io/kubectl v0.31.0
k8s.io/kubelet => k8s.io/kubelet v0.31.0
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.31.0
k8s.io/metrics => k8s.io/metrics v0.31.0
k8s.io/mount-utils => k8s.io/mount-utils v0.31.0
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.0
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.0
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.31.0
k8s.io/sample-controller => k8s.io/sample-controller v0.31.0
)
Loading
Loading