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

Commit 97ad5b5

Browse files
pjiang-devpjiang-dev
authored
chore: bump k8s v1.34 (#773)
* bump k8s v1.34 Signed-off-by: Peter Jiang <[email protected]> * fix broken dependencies Signed-off-by: Peter Jiang <[email protected]> --------- Signed-off-by: Peter Jiang <[email protected]>
1 parent b3a2ec1 commit 97ad5b5

File tree

11 files changed

+119
-131
lines changed

11 files changed

+119
-131
lines changed

‎go.mod‎

Lines changed: 54 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,25 @@ require (
66
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
77
github.com/evanphx/json-patch/v5 v5.9.11
88
github.com/go-logr/logr v1.4.3
9-
github.com/google/gnostic-models v0.6.9
9+
github.com/google/gnostic-models v0.7.0
1010
github.com/google/uuid v1.6.0
1111
github.com/spf13/cobra v1.9.1
1212
github.com/stretchr/testify v1.10.0
1313
go.uber.org/mock v0.5.2
1414
golang.org/x/sync v0.15.0
1515
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
16+
k8s.io/api v0.34.0
17+
k8s.io/apiextensions-apiserver v0.34.0
18+
k8s.io/apimachinery v0.34.0
19+
k8s.io/cli-runtime v0.34.0
20+
k8s.io/client-go v0.34.0
2121
k8s.io/klog/v2 v2.130.1
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
27-
sigs.k8s.io/yaml v1.4.0
22+
k8s.io/kube-aggregator v0.34.0
23+
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b
24+
k8s.io/kubectl v0.34.0
25+
k8s.io/kubernetes v1.34.0
26+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0
27+
sigs.k8s.io/yaml v1.6.0
2828
)
2929

3030
require (
@@ -38,15 +38,14 @@ require (
3838
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.8.0 // indirect
41+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
4242
github.com/go-errors/errors v1.5.1 // indirect
4343
github.com/go-openapi/jsonpointer v0.21.1 // indirect
4444
github.com/go-openapi/jsonreference v0.21.0 // indirect
4545
github.com/go-openapi/swag v0.23.1 // indirect
4646
github.com/gogo/protobuf v1.3.2 // indirect
4747
github.com/google/btree v1.1.3 // indirect
4848
github.com/google/go-cmp v0.7.0 // indirect
49-
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
5049
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
5150
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
5251
github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -59,7 +58,7 @@ require (
5958
github.com/moby/spdystream v0.5.0 // indirect
6059
github.com/moby/term v0.5.2 // indirect
6160
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
62-
github.com/modern-go/reflect2 v1.0.2 // indirect
61+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
6362
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
6463
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
6564
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
@@ -78,6 +77,8 @@ require (
7877
github.com/xlab/treeprint v1.2.0 // indirect
7978
go.opentelemetry.io/otel v1.36.0 // indirect
8079
go.opentelemetry.io/otel/trace v1.36.0 // indirect
80+
go.yaml.in/yaml/v2 v2.4.2 // indirect
81+
go.yaml.in/yaml/v3 v3.0.4 // indirect
8182
golang.org/x/net v0.41.0 // indirect
8283
golang.org/x/oauth2 v0.30.0 // indirect
8384
golang.org/x/sys v0.33.0 // indirect
@@ -87,49 +88,49 @@ require (
8788
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
8889
gopkg.in/inf.v0 v0.9.1 // indirect
8990
gopkg.in/yaml.v3 v3.0.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
91+
k8s.io/apiserver v0.34.0 // indirect
92+
k8s.io/component-base v0.34.0 // indirect
93+
k8s.io/component-helpers v0.34.0 // indirect
94+
k8s.io/controller-manager v0.34.0 // indirect
9495
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
9596
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
97+
sigs.k8s.io/kustomize/api v0.20.1 // indirect
98+
sigs.k8s.io/kustomize/kyaml v0.20.1 // indirect
9899
sigs.k8s.io/randfill v1.0.0 // indirect
99100
)
100101

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

‎go.sum‎

Lines changed: 44 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f h1:Wl78ApPPB2
2929
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f/go.mod h1:OSYXu++VVOHnXeitef/D8n/6y4QV8uLHSFXX4NeXMGc=
3030
github.com/fatih/camelcase v1.0.0 h1:hxNvNX/xYBp0ovncs8WyWZrOrpBNub/JfaMvbURyft8=
3131
github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc=
32-
github.com/fxamacker/cbor/v2 v2.8.0 h1:fFtUGXUzXPHTIUdne5+zzMPTfffl3RD5qYnkY40vtxU=
33-
github.com/fxamacker/cbor/v2 v2.8.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
32+
github.com/fxamacker/cbor/v2 v2.9.0 h1:NpKPmjDBgUfBms6tr6JZkTHtfFGcMKsw3eGcmD/sapM=
33+
github.com/fxamacker/cbor/v2 v2.9.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
3434
github.com/go-errors/errors v1.5.1 h1:ZwEMSLRCapFLflTpT7NKaAc7ukJ8ZPEjzlxt8rPN8bk=
3535
github.com/go-errors/errors v1.5.1/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
3636
github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
@@ -47,16 +47,13 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
4747
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
4848
github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg=
4949
github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
50-
github.com/google/gnostic-models v0.6.9 h1:MU/8wDLif2qCXZmzncUQ/BOfxWfthHi63KqpoNbWqVw=
51-
github.com/google/gnostic-models v0.6.9/go.mod h1:CiWsm0s6BSQd1hRn8/QmxqB6BesYcbSZxsz9b0KuDBw=
52-
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
50+
github.com/google/gnostic-models v0.7.0 h1:qwTtogB15McXDaNqTZdzPJRHvaVJlAl+HVQnLmJEJxo=
51+
github.com/google/gnostic-models v0.7.0/go.mod h1:whL5G0m6dmc5cPxKc5bdKdEN3UjI7OUGxBlw57miDrQ=
5352
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
5453
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
5554
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
5655
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db h1:097atOisP2aRj7vFgYQBbFN4U4JNXUNYpxael3UzMyo=
5756
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
58-
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
59-
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
6057
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
6158
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
6259
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 h1:JeSE6pjso5THxAzdVpqr6/geYxZytqFMBCOtn/ujyeo=
@@ -96,8 +93,9 @@ github.com/moby/term v0.5.2/go.mod h1:d3djjFCrjnB+fl8NJux+EJzu0msscUP+f8it8hPkFL
9693
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
9794
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
9895
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
99-
github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
10096
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
97+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee h1:W5t00kpgFdJifH4BDsTlE89Zl93FEloxaWZfGcifgq8=
98+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
10199
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 h1:n6/2gBQ3RWajuToeY6ZtZTIKv2v7ThUy5KKusIT0yc0=
102100
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00/go.mod h1:Pm3mSP3c5uWn86xMLZ5Sa7JB9GsEZySvHYXCTK4E9q4=
103101
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
@@ -157,6 +155,10 @@ go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
157155
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
158156
go.uber.org/mock v0.5.2 h1:LbtPTcP8A5k9WPXj54PPPbjcI4Y6lhyOZXn+VS7wNko=
159157
go.uber.org/mock v0.5.2/go.mod h1:wLlUxC2vVTPTaE3UD51E0BGOAElKrILxhVSDYQLld5o=
158+
go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=
159+
go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
160+
go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
161+
go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
160162
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
161163
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
162164
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
@@ -211,46 +213,45 @@ gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
211213
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
212214
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
213215
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
214-
k8s.io/api v0.33.1 h1:tA6Cf3bHnLIrUK4IqEgb2v++/GYUtqiu9sRVk3iBXyw=
215-
k8s.io/api v0.33.1/go.mod h1:87esjTn9DRSRTD4fWMXamiXxJhpOIREjWOSjsW1kEHw=
216-
k8s.io/apiextensions-apiserver v0.33.1 h1:N7ccbSlRN6I2QBcXevB73PixX2dQNIW0ZRuguEE91zI=
217-
k8s.io/apiextensions-apiserver v0.33.1/go.mod h1:uNQ52z1A1Gu75QSa+pFK5bcXc4hq7lpOXbweZgi4dqA=
218-
k8s.io/apimachinery v0.33.1 h1:mzqXWV8tW9Rw4VeW9rEkqvnxj59k1ezDUl20tFK/oM4=
219-
k8s.io/apimachinery v0.33.1/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
220-
k8s.io/apiserver v0.33.1 h1:yLgLUPDVC6tHbNcw5uE9mo1T6ELhJj7B0geifra3Qdo=
221-
k8s.io/apiserver v0.33.1/go.mod h1:VMbE4ArWYLO01omz+k8hFjAdYfc3GVAYPrhP2tTKccs=
222-
k8s.io/cli-runtime v0.33.1 h1:TvpjEtF71ViFmPeYMj1baZMJR4iWUEplklsUQ7D3quA=
223-
k8s.io/cli-runtime v0.33.1/go.mod h1:9dz5Q4Uh8io4OWCLiEf/217DXwqNgiTS/IOuza99VZE=
224-
k8s.io/client-go v0.33.1 h1:ZZV/Ks2g92cyxWkRRnfUDsnhNn28eFpt26aGc8KbXF4=
225-
k8s.io/client-go v0.33.1/go.mod h1:JAsUrl1ArO7uRVFWfcj6kOomSlCv+JpvIsp6usAGefA=
226-
k8s.io/component-base v0.33.1 h1:EoJ0xA+wr77T+G8p6T3l4efT2oNwbqBVKR71E0tBIaI=
227-
k8s.io/component-base v0.33.1/go.mod h1:guT/w/6piyPfTgq7gfvgetyXMIh10zuXA6cRRm3rDuY=
228-
k8s.io/component-helpers v0.33.1 h1:DdQMww8jOr+sGhIrkz70Lp9Qerq/JzeZDBRd508DHDo=
229-
k8s.io/component-helpers v0.33.1/go.mod h1:LQwxW5L3dH7341Unj+phndJu0Ic5UjxA//7FT8YVP5U=
230-
k8s.io/controller-manager v0.33.1 h1:ZYTzGp2f9TVhHCvrgSQtc367yR+D3UditkHDHCZc2GU=
231-
k8s.io/controller-manager v0.33.1/go.mod h1:p1yW7I5NFIuhXvSW9Wa/MdN3oIqXd2DRDgacb/hcUF0=
216+
k8s.io/api v0.34.0 h1:L+JtP2wDbEYPUeNGbeSa/5GwFtIA662EmT2YSLOkAVE=
217+
k8s.io/api v0.34.0/go.mod h1:YzgkIzOOlhl9uwWCZNqpw6RJy9L2FK4dlJeayUoydug=
218+
k8s.io/apiextensions-apiserver v0.34.0 h1:B3hiB32jV7BcyKcMU5fDaDxk882YrJ1KU+ZSkA9Qxoc=
219+
k8s.io/apiextensions-apiserver v0.34.0/go.mod h1:hLI4GxE1BDBy9adJKxUxCEHBGZtGfIg98Q+JmTD7+g0=
220+
k8s.io/apimachinery v0.34.0 h1:eR1WO5fo0HyoQZt1wdISpFDffnWOvFLOOeJ7MgIv4z0=
221+
k8s.io/apimachinery v0.34.0/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
222+
k8s.io/apiserver v0.34.0 h1:Z51fw1iGMqN7uJ1kEaynf2Aec1Y774PqU+FVWCFV3Jg=
223+
k8s.io/apiserver v0.34.0/go.mod h1:52ti5YhxAvewmmpVRqlASvaqxt0gKJxvCeW7ZrwgazQ=
224+
k8s.io/cli-runtime v0.34.0 h1:N2/rUlJg6TMEBgtQ3SDRJwa8XyKUizwjlOknT1mB2Cw=
225+
k8s.io/cli-runtime v0.34.0/go.mod h1:t/skRecS73Piv+J+FmWIQA2N2/rDjdYSQzEE67LUUs8=
226+
k8s.io/client-go v0.34.0 h1:YoWv5r7bsBfb0Hs2jh8SOvFbKzzxyNo0nSb0zC19KZo=
227+
k8s.io/client-go v0.34.0/go.mod h1:ozgMnEKXkRjeMvBZdV1AijMHLTh3pbACPvK7zFR+QQY=
228+
k8s.io/component-base v0.34.0 h1:bS8Ua3zlJzapklsB1dZgjEJuJEeHjj8yTu1gxE2zQX8=
229+
k8s.io/component-base v0.34.0/go.mod h1:RSCqUdvIjjrEm81epPcjQ/DS+49fADvGSCkIP3IC6vg=
230+
k8s.io/component-helpers v0.34.0 h1:5T7P9XGMoUy1JDNKzHf0p/upYbeUf8ZaSf9jbx0QlIo=
231+
k8s.io/component-helpers v0.34.0/go.mod h1:kaOyl5tdtnymriYcVZg4uwDBe2d1wlIpXyDkt6sVnt4=
232+
k8s.io/controller-manager v0.34.0 h1:oCHoqS8dcFp7zDSu7HUvTpakq3isSxil3GprGGlJMsE=
233+
k8s.io/controller-manager v0.34.0/go.mod h1:XFto21U+Mm9BT8r/Jd5E4tHCGtwjKAUFOuDcqaj2VK0=
232234
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
233235
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
234-
k8s.io/kube-aggregator v0.33.1 h1:PigQUqAvd6Y4hBjQAqhKz3lEJC2VHLL4bSOEuS06a40=
235-
k8s.io/kube-aggregator v0.33.1/go.mod h1:16/wlU5Lj7hNJSv7JSu5FLvxyrgiJVLCHzfVoECAsuI=
236-
k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a h1:ZV3Zr+/7s7aVbjNGICQt+ppKWsF1tehxggNfbM7XnG8=
237-
k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8=
238-
k8s.io/kubectl v0.33.1 h1:OJUXa6FV5bap6iRy345ezEjU9dTLxqv1zFTVqmeHb6A=
239-
k8s.io/kubectl v0.33.1/go.mod h1:Z07pGqXoP4NgITlPRrnmiM3qnoo1QrK1zjw85Aiz8J0=
240-
k8s.io/kubernetes v1.33.1 h1:86+VVY/f11taZdpEZrNciLw1MIQhu6BFXf/OMFn5EUg=
241-
k8s.io/kubernetes v1.33.1/go.mod h1:2nWuPk0seE4+6sd0x60wQ6rYEXcV7SoeMbU0YbFm/5k=
236+
k8s.io/kube-aggregator v0.34.0 h1:XE4u+HOYkj0g44sblhTtPv+QyIIK7sJxrIlia0731kE=
237+
k8s.io/kube-aggregator v0.34.0/go.mod h1:GIUqdChXVC448Vp2Wgxf0m6fir7Xt3A2TAZcs2JNG1Y=
238+
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b h1:MloQ9/bdJyIu9lb1PzujOPolHyvO06MXG5TUIj2mNAA=
239+
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b/go.mod h1:UZ2yyWbFTpuhSbFhv24aGNOdoRdJZgsIObGBUaYVsts=
240+
k8s.io/kubectl v0.34.0 h1:NcXz4TPTaUwhiX4LU+6r6udrlm0NsVnSkP3R9t0dmxs=
241+
k8s.io/kubectl v0.34.0/go.mod h1:bmd0W5i+HuG7/p5sqicr0Li0rR2iIhXL0oUyLF3OjR4=
242+
k8s.io/kubernetes v1.34.0 h1:NvUrwPAVB4W3mSOpJ/RtNGHWWYyUP/xPaX5rUSpzA0w=
243+
k8s.io/kubernetes v1.34.0/go.mod h1:iu+FhII+Oc/1gGWLJcer6wpyih441aNFHl7Pvm8yPto=
242244
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y=
243245
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
244246
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
245247
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
246-
sigs.k8s.io/kustomize/api v0.19.0 h1:F+2HB2mU1MSiR9Hp1NEgoU2q9ItNOaBJl0I4Dlus5SQ=
247-
sigs.k8s.io/kustomize/api v0.19.0/go.mod h1:/BbwnivGVcBh1r+8m3tH1VNxJmHSk1PzP5fkP6lbL1o=
248-
sigs.k8s.io/kustomize/kyaml v0.19.0 h1:RFge5qsO1uHhwJsu3ipV7RNolC7Uozc0jUBC/61XSlA=
249-
sigs.k8s.io/kustomize/kyaml v0.19.0/go.mod h1:FeKD5jEOH+FbZPpqUghBP8mrLjJ3+zD3/rf9NNu1cwY=
250-
sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
248+
sigs.k8s.io/kustomize/api v0.20.1 h1:iWP1Ydh3/lmldBnH/S5RXgT98vWYMaTUL1ADcr+Sv7I=
249+
sigs.k8s.io/kustomize/api v0.20.1/go.mod h1:t6hUFxO+Ph0VxIk1sKp1WS0dOjbPCtLJ4p8aADLwqjM=
250+
sigs.k8s.io/kustomize/kyaml v0.20.1 h1:PCMnA2mrVbRP3NIB6v9kYCAc38uvFLVs8j/CD567A78=
251+
sigs.k8s.io/kustomize/kyaml v0.20.1/go.mod h1:0EmkQHRUsJxY8Ug9Niig1pUMSCGHxQ5RklbpV/Ri6po=
251252
sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=
252253
sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
253-
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 h1:qPeWmscJcXP0snki5IYF79Z8xrl8ETFxgMd7wez1XkI=
254-
sigs.k8s.io/structured-merge-diff/v4 v4.7.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps=
255-
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
256-
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
254+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 h1:jTijUJbW353oVOd9oTlifJqOGEkUw2jB/fXCbTiQEco=
255+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE=
256+
sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs=
257+
sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4=

‎pkg/diff/diff.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ import (
2222
"k8s.io/apimachinery/pkg/util/managedfields"
2323
"k8s.io/apimachinery/pkg/util/strategicpatch"
2424
"k8s.io/client-go/kubernetes/scheme"
25-
"sigs.k8s.io/structured-merge-diff/v4/fieldpath"
26-
"sigs.k8s.io/structured-merge-diff/v4/merge"
27-
"sigs.k8s.io/structured-merge-diff/v4/typed"
25+
"sigs.k8s.io/structured-merge-diff/v6/fieldpath"
26+
"sigs.k8s.io/structured-merge-diff/v6/merge"
27+
"sigs.k8s.io/structured-merge-diff/v6/typed"
2828

2929
"github.com/argoproj/gitops-engine/internal/kubernetes_vendor/pkg/api/v1/endpoints"
3030
"github.com/argoproj/gitops-engine/pkg/diff/internal/fieldmanager"

0 commit comments

Comments
 (0)