Skip to content

Commit 95e0025

Browse files
chore: bump k8s libraries to 1.31 (#619)
* bump latest kubernetes version Signed-off-by: sivchari <[email protected]> * upgrade Go version to resolve dependencies Signed-off-by: sivchari <[email protected]> * fix: ci Signed-off-by: sivchari <[email protected]> * use Go1.22.3 Signed-off-by: sivchari <[email protected]> * update from 1.29.2 to 1.30.1 Signed-off-by: sivchari <[email protected]> * update go.sum Signed-off-by: sivchari <[email protected]> * upgrade golangci-lint Signed-off-by: sivchari <[email protected]> * bump to 0.30.2 Signed-off-by: Michael Crenshaw <[email protected]> * remove unnecessary replace Signed-off-by: Michael Crenshaw <[email protected]> * latest patch Signed-off-by: Michael Crenshaw <[email protected]> * chore: bump k8s libraries from 1.30 to 1.31 Signed-off-by: Michael Crenshaw <[email protected]> --------- Signed-off-by: sivchari <[email protected]> Signed-off-by: Michael Crenshaw <[email protected]> Co-authored-by: sivchari <[email protected]>
1 parent 099cba6 commit 95e0025

File tree

3 files changed

+655
-423
lines changed

3 files changed

+655
-423
lines changed

go.mod

Lines changed: 68 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -3,46 +3,46 @@ module github.com/argoproj/gitops-engine
33
go 1.22.0
44

55
require (
6-
github.com/davecgh/go-spew v1.1.1
6+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
77
github.com/evanphx/json-patch v4.12.0+incompatible
8-
github.com/go-logr/logr v1.4.1
8+
github.com/go-logr/logr v1.4.2
99
github.com/golang/mock v1.6.0
1010
github.com/google/gnostic-models v0.6.8
11-
github.com/google/uuid v1.3.0
12-
github.com/spf13/cobra v1.7.0
13-
github.com/stretchr/testify v1.8.4
14-
golang.org/x/sync v0.6.0
15-
google.golang.org/protobuf v1.33.0
16-
k8s.io/api v0.30.4
11+
github.com/google/uuid v1.6.0
12+
github.com/spf13/cobra v1.8.1
13+
github.com/stretchr/testify v1.9.0
14+
golang.org/x/sync v0.7.0
15+
google.golang.org/protobuf v1.34.2
16+
k8s.io/api v0.31.0
1717
k8s.io/apiextensions-apiserver v0.31.2
18-
k8s.io/apimachinery v0.30.4
19-
k8s.io/cli-runtime v0.30.4
20-
k8s.io/client-go v0.30.4
21-
k8s.io/klog/v2 v2.120.1
18+
k8s.io/apimachinery v0.31.0
19+
k8s.io/cli-runtime v0.31.0
20+
k8s.io/client-go v0.31.0
21+
k8s.io/klog/v2 v2.130.1
2222
k8s.io/kube-aggregator v0.31.2
2323
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340
2424
k8s.io/kubectl v0.31.2
25-
k8s.io/kubernetes v1.30.4
25+
k8s.io/kubernetes v1.31.0
2626
sigs.k8s.io/structured-merge-diff/v4 v4.4.1
27-
sigs.k8s.io/yaml v1.3.0
27+
sigs.k8s.io/yaml v1.4.0
2828
)
2929

3030
require (
3131
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
3232
github.com/MakeNowJust/heredoc v1.0.0 // indirect
3333
github.com/beorn7/perks v1.0.1 // indirect
3434
github.com/blang/semver/v4 v4.0.0 // indirect
35-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
35+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3636
github.com/chai2010/gettext-go v1.0.2 // indirect
3737
github.com/distribution/reference v0.5.0 // indirect
3838
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
3939
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
4040
github.com/fatih/camelcase v1.0.0 // indirect
41-
github.com/fvbommel/sortorder v1.1.0 // indirect
41+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
4242
github.com/go-errors/errors v1.4.2 // indirect
4343
github.com/go-openapi/jsonpointer v0.19.6 // indirect
4444
github.com/go-openapi/jsonreference v0.20.2 // indirect
45-
github.com/go-openapi/swag v0.22.3 // indirect
45+
github.com/go-openapi/swag v0.22.4 // indirect
4646
github.com/gogo/protobuf v1.3.2 // indirect
4747
github.com/golang/protobuf v1.5.4 // indirect
4848
github.com/google/btree v1.0.1 // indirect
@@ -58,10 +58,9 @@ require (
5858
github.com/json-iterator/go v1.1.12 // indirect
5959
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
6060
github.com/mailru/easyjson v0.7.7 // indirect
61-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
6261
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
63-
github.com/moby/spdystream v0.2.0 // indirect
64-
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
62+
github.com/moby/spdystream v0.4.0 // indirect
63+
github.com/moby/term v0.5.0 // indirect
6564
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6665
github.com/modern-go/reflect2 v1.0.2 // indirect
6766
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
@@ -70,65 +69,67 @@ require (
7069
github.com/opencontainers/go-digest v1.0.0 // indirect
7170
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
7271
github.com/pkg/errors v0.9.1 // indirect
73-
github.com/pmezard/go-difflib v1.0.0 // indirect
74-
github.com/prometheus/client_golang v1.16.0 // indirect
75-
github.com/prometheus/client_model v0.4.0 // indirect
76-
github.com/prometheus/common v0.44.0 // indirect
77-
github.com/prometheus/procfs v0.10.1 // indirect
72+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
73+
github.com/prometheus/client_golang v1.19.1 // indirect
74+
github.com/prometheus/client_model v0.6.1 // indirect
75+
github.com/prometheus/common v0.55.0 // indirect
76+
github.com/prometheus/procfs v0.15.1 // indirect
7877
github.com/russross/blackfriday/v2 v2.1.0 // indirect
7978
github.com/spf13/pflag v1.0.5 // indirect
80-
github.com/stretchr/objx v0.5.0 // indirect
79+
github.com/stretchr/objx v0.5.2 // indirect
80+
github.com/x448/float16 v0.8.4 // indirect
8181
github.com/xlab/treeprint v1.2.0 // indirect
8282
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
83-
golang.org/x/net v0.23.0 // indirect
84-
golang.org/x/oauth2 v0.10.0 // indirect
85-
golang.org/x/sys v0.18.0 // indirect
86-
golang.org/x/term v0.18.0 // indirect
87-
golang.org/x/text v0.14.0 // indirect
83+
golang.org/x/net v0.26.0 // indirect
84+
golang.org/x/oauth2 v0.21.0 // indirect
85+
golang.org/x/sys v0.21.0 // indirect
86+
golang.org/x/term v0.21.0 // indirect
87+
golang.org/x/text v0.16.0 // indirect
8888
golang.org/x/time v0.3.0 // indirect
89-
google.golang.org/appengine v1.6.7 // indirect
89+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
9090
gopkg.in/inf.v0 v0.9.1 // indirect
9191
gopkg.in/yaml.v2 v2.4.0 // indirect
9292
gopkg.in/yaml.v3 v3.0.1 // indirect
93-
k8s.io/apiserver v0.30.4 // indirect
94-
k8s.io/component-base v0.30.4 // indirect
95-
k8s.io/component-helpers v0.30.4 // indirect
96-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
93+
k8s.io/apiserver v0.31.0 // indirect
94+
k8s.io/component-base v0.31.0 // indirect
95+
k8s.io/component-helpers v0.31.0 // indirect
96+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
9797
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
98-
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
99-
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
98+
sigs.k8s.io/kustomize/api v0.17.2 // indirect
99+
sigs.k8s.io/kustomize/kyaml v0.17.1 // indirect
100100
)
101101

102102
replace (
103103
// After bumping these versions, run hack/update_static_schema.sh in case the schema has changed.
104-
k8s.io/api => k8s.io/api v0.30.4
105-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.30.4
106-
k8s.io/apimachinery => k8s.io/apimachinery v0.30.4
107-
k8s.io/apiserver => k8s.io/apiserver v0.30.4
108-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.30.4
109-
k8s.io/client-go => k8s.io/client-go v0.30.4
110-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.30.4
111-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.30.4
112-
k8s.io/code-generator => k8s.io/code-generator v0.30.4
113-
k8s.io/component-base => k8s.io/component-base v0.30.4
114-
k8s.io/component-helpers => k8s.io/component-helpers v0.30.4
115-
k8s.io/controller-manager => k8s.io/controller-manager v0.30.4
116-
k8s.io/cri-api => k8s.io/cri-api v0.30.4
117-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.30.4
118-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.30.4
104+
k8s.io/api => k8s.io/api v0.31.0
105+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.0
106+
k8s.io/apimachinery => k8s.io/apimachinery v0.31.0
107+
k8s.io/apiserver => k8s.io/apiserver v0.31.0
108+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.0
109+
k8s.io/client-go => k8s.io/client-go v0.31.0
110+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.0
111+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.0
112+
k8s.io/code-generator => k8s.io/code-generator v0.31.0
113+
k8s.io/component-base => k8s.io/component-base v0.31.0
114+
k8s.io/component-helpers => k8s.io/component-helpers v0.31.0
115+
k8s.io/controller-manager => k8s.io/controller-manager v0.31.0
116+
k8s.io/cri-api => k8s.io/cri-api v0.31.0
117+
k8s.io/cri-client => k8s.io/cri-client v0.31.0
118+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.0
119+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.0
119120
k8s.io/endpointslice => k8s.io/endpointslice v0.31.2
120-
k8s.io/kms => k8s.io/kms v0.30.4
121-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.30.4
122-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.30.4
123-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.30.4
124-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.30.4
125-
k8s.io/kubectl => k8s.io/kubectl v0.30.4
126-
k8s.io/kubelet => k8s.io/kubelet v0.30.4
127-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.30.4
128-
k8s.io/metrics => k8s.io/metrics v0.30.4
129-
k8s.io/mount-utils => k8s.io/mount-utils v0.30.4
130-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.30.4
131-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.30.4
132-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.30.4
133-
k8s.io/sample-controller => k8s.io/sample-controller v0.30.4
121+
k8s.io/kms => k8s.io/kms v0.31.0
122+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.0
123+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.0
124+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.0
125+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.0
126+
k8s.io/kubectl => k8s.io/kubectl v0.31.0
127+
k8s.io/kubelet => k8s.io/kubelet v0.31.0
128+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.31.0
129+
k8s.io/metrics => k8s.io/metrics v0.31.0
130+
k8s.io/mount-utils => k8s.io/mount-utils v0.31.0
131+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.0
132+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.0
133+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.31.0
134+
k8s.io/sample-controller => k8s.io/sample-controller v0.31.0
134135
)

0 commit comments

Comments
 (0)