Skip to content
This repository was archived by the owner on Nov 8, 2025. It is now read-only.

Commit f8f1b61

Browse files
pjiang-devpjiang-dev
authored
chore: upgrade k8s to 1.33.1 (#735)
* upgrade k8s to 1.33.1 Signed-off-by: Peter Jiang <peterjiang823@gmail.com> * fix linter issues Signed-off-by: Peter Jiang <peterjiang823@gmail.com> --------- Signed-off-by: Peter Jiang <peterjiang823@gmail.com>
1 parent 8697b44 commit f8f1b61

File tree

5 files changed

+1434
-296
lines changed

5 files changed

+1434
-296
lines changed

‎go.mod‎

Lines changed: 81 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,63 @@
11
module github.com/argoproj/gitops-engine
22

3-
go 1.23.5
3+
go 1.24.0
44

55
require (
66
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
77
github.com/evanphx/json-patch/v5 v5.9.11
8-
github.com/go-logr/logr v1.4.2
8+
github.com/go-logr/logr v1.4.3
99
github.com/google/gnostic-models v0.6.9
1010
github.com/google/uuid v1.6.0
1111
github.com/spf13/cobra v1.9.1
1212
github.com/stretchr/testify v1.10.0
13-
go.uber.org/mock v0.5.0
14-
golang.org/x/sync v0.12.0
15-
google.golang.org/protobuf v1.36.5
16-
k8s.io/api v0.32.2
17-
k8s.io/apiextensions-apiserver v0.32.2
18-
k8s.io/apimachinery v0.32.2
19-
k8s.io/cli-runtime v0.32.2
20-
k8s.io/client-go v0.32.2
13+
go.uber.org/mock v0.5.2
14+
golang.org/x/sync v0.15.0
15+
google.golang.org/protobuf v1.36.6
16+
k8s.io/api v0.33.1
17+
k8s.io/apiextensions-apiserver v0.33.1
18+
k8s.io/apimachinery v0.33.1
19+
k8s.io/cli-runtime v0.33.1
20+
k8s.io/client-go v0.33.1
2121
k8s.io/klog/v2 v2.130.1
22-
k8s.io/kube-aggregator v0.32.2
23-
k8s.io/kube-openapi v0.0.0-20250304201544-e5f78fe3ede9
24-
k8s.io/kubectl v0.32.2
25-
k8s.io/kubernetes v1.32.2
26-
sigs.k8s.io/structured-merge-diff/v4 v4.6.0
22+
k8s.io/kube-aggregator v0.33.1
23+
k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a
24+
k8s.io/kubectl v0.33.1
25+
k8s.io/kubernetes v1.33.1
26+
sigs.k8s.io/structured-merge-diff/v4 v4.7.0
2727
sigs.k8s.io/yaml v1.4.0
2828
)
2929

3030
require (
31-
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
31+
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // 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
3535
github.com/cespare/xxhash/v2 v2.3.0 // indirect
36-
github.com/chai2010/gettext-go v1.0.2 // indirect
36+
github.com/chai2010/gettext-go v1.0.3 // indirect
3737
github.com/distribution/reference v0.6.0 // indirect
38-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
38+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
3939
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
4040
github.com/fatih/camelcase v1.0.0 // indirect
41-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
42-
github.com/go-errors/errors v1.4.2 // indirect
43-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
44-
github.com/go-openapi/jsonreference v0.20.2 // indirect
45-
github.com/go-openapi/swag v0.23.0 // indirect
41+
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
42+
github.com/go-errors/errors v1.5.1 // indirect
43+
github.com/go-openapi/jsonpointer v0.21.1 // indirect
44+
github.com/go-openapi/jsonreference v0.21.0 // indirect
45+
github.com/go-openapi/swag v0.23.1 // indirect
4646
github.com/gogo/protobuf v1.3.2 // indirect
47-
github.com/golang/protobuf v1.5.4 // indirect
48-
github.com/google/btree v1.0.1 // indirect
49-
github.com/google/go-cmp v0.6.0 // indirect
50-
github.com/google/gofuzz v1.2.0 // indirect
47+
github.com/google/btree v1.1.3 // indirect
48+
github.com/google/go-cmp v0.7.0 // indirect
5149
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
52-
github.com/gorilla/websocket v1.5.0 // indirect
50+
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
5351
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
5452
github.com/inconshreveable/mousetrap v1.1.0 // indirect
55-
github.com/jonboulle/clockwork v0.4.0 // indirect
53+
github.com/jonboulle/clockwork v0.5.0 // indirect
5654
github.com/josharian/intern v1.0.0 // indirect
5755
github.com/json-iterator/go v1.1.12 // indirect
5856
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
59-
github.com/mailru/easyjson v0.7.7 // indirect
57+
github.com/mailru/easyjson v0.9.0 // indirect
6058
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
6159
github.com/moby/spdystream v0.5.0 // indirect
62-
github.com/moby/term v0.5.0 // indirect
60+
github.com/moby/term v0.5.2 // indirect
6361
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6462
github.com/modern-go/reflect2 v1.0.2 // indirect
6563
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
@@ -69,69 +67,69 @@ require (
6967
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
7068
github.com/pkg/errors v0.9.1 // indirect
7169
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
72-
github.com/prometheus/client_golang v1.19.1 // indirect
73-
github.com/prometheus/client_model v0.6.1 // indirect
74-
github.com/prometheus/common v0.55.0 // indirect
75-
github.com/prometheus/procfs v0.15.1 // indirect
70+
github.com/prometheus/client_golang v1.22.0 // indirect
71+
github.com/prometheus/client_model v0.6.2 // indirect
72+
github.com/prometheus/common v0.64.0 // indirect
73+
github.com/prometheus/procfs v0.16.1 // indirect
7674
github.com/russross/blackfriday/v2 v2.1.0 // indirect
7775
github.com/spf13/pflag v1.0.6 // indirect
7876
github.com/stretchr/objx v0.5.2 // indirect
7977
github.com/x448/float16 v0.8.4 // indirect
8078
github.com/xlab/treeprint v1.2.0 // indirect
81-
go.opentelemetry.io/otel v1.28.0 // indirect
82-
go.opentelemetry.io/otel/trace v1.28.0 // indirect
83-
golang.org/x/net v0.38.0 // indirect
84-
golang.org/x/oauth2 v0.23.0 // indirect
85-
golang.org/x/sys v0.31.0 // indirect
86-
golang.org/x/term v0.30.0 // indirect
87-
golang.org/x/text v0.23.0 // indirect
88-
golang.org/x/time v0.7.0 // indirect
79+
go.opentelemetry.io/otel v1.36.0 // indirect
80+
go.opentelemetry.io/otel/trace v1.36.0 // indirect
81+
golang.org/x/net v0.41.0 // indirect
82+
golang.org/x/oauth2 v0.30.0 // indirect
83+
golang.org/x/sys v0.33.0 // indirect
84+
golang.org/x/term v0.32.0 // indirect
85+
golang.org/x/text v0.26.0 // indirect
86+
golang.org/x/time v0.12.0 // indirect
8987
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
9088
gopkg.in/inf.v0 v0.9.1 // indirect
9189
gopkg.in/yaml.v3 v3.0.1 // indirect
92-
k8s.io/apiserver v0.32.2 // indirect
93-
k8s.io/component-base v0.32.2 // indirect
94-
k8s.io/component-helpers v0.32.2 // indirect
95-
k8s.io/controller-manager v0.0.0 // indirect
96-
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
97-
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
98-
sigs.k8s.io/kustomize/api v0.18.0 // indirect
99-
sigs.k8s.io/kustomize/kyaml v0.18.1 // indirect
90+
k8s.io/apiserver v0.33.1 // indirect
91+
k8s.io/component-base v0.33.1 // indirect
92+
k8s.io/component-helpers v0.33.1 // indirect
93+
k8s.io/controller-manager v0.33.1 // indirect
94+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
95+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
96+
sigs.k8s.io/kustomize/api v0.19.0 // indirect
97+
sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect
10098
sigs.k8s.io/randfill v1.0.0 // indirect
10199
)
102100

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

0 commit comments

Comments
 (0)