Skip to content

Commit 7814472

Browse files
authored
[v0.13] Revert false-drift workaround and restore legacyscheme (#5008)
* Revert "[v0.13] Prevent false drift from null field rendering (#5000)" This reverts commit c89c99a. * Revert "Remove k8s.io/kubernetes, use client-go scheme (#4904)" This reverts commit 1e3a9fc. * Bump Kubernetes to the same version 1.33.10 as the other k8s libraries.
1 parent c89c99a commit 7814472

12 files changed

Lines changed: 43 additions & 677 deletions

File tree

e2e/assets/gitrepo/helm-recreate-drift-gitrepo.yaml

Lines changed: 0 additions & 10 deletions
This file was deleted.

e2e/assets/helm-recreate-drift/chart/Chart.yaml

Lines changed: 0 additions & 6 deletions
This file was deleted.

e2e/assets/helm-recreate-drift/chart/templates/deployment.yaml

Lines changed: 0 additions & 21 deletions
This file was deleted.

e2e/assets/helm-recreate-drift/fleet.yaml

Lines changed: 0 additions & 7 deletions
This file was deleted.

e2e/single-cluster/helm_recreate_drift_test.go

Lines changed: 0 additions & 146 deletions
This file was deleted.

go.mod

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ require (
5858
k8s.io/klog/v2 v2.130.1
5959
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff
6060
k8s.io/kubectl v0.33.10
61+
k8s.io/kubernetes v1.33.10
6162
k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979
6263
oras.land/oras-go/v2 v2.6.0
6364
sigs.k8s.io/cli-utils v0.37.2
@@ -124,6 +125,7 @@ require (
124125
github.com/containerd/stargz-snapshotter/estargz v0.16.3 // indirect
125126
github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
126127
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
128+
github.com/distribution/reference v0.6.0 // indirect
127129
github.com/docker/cli v29.2.0+incompatible // indirect
128130
github.com/docker/distribution v2.8.3+incompatible // indirect
129131
github.com/docker/docker-credential-helpers v0.9.3 // indirect
@@ -252,6 +254,8 @@ require (
252254
k8s.io/apiserver v0.33.10 // indirect
253255
k8s.io/code-generator v0.33.10 // indirect
254256
k8s.io/component-base v0.33.10 // indirect
257+
k8s.io/component-helpers v0.33.10 // indirect
258+
k8s.io/controller-manager v0.33.10 // indirect
255259
k8s.io/gengo v0.0.0-20250130153323-76c5745d3511 // indirect
256260
k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7 // indirect
257261
k8s.io/helm v2.17.0+incompatible // indirect

go.sum

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -665,6 +665,10 @@ k8s.io/code-generator v0.33.10 h1:xnJ0+fJ0f4FlDguoJDdUNFnEAcHkNQKj9YR2InrsYBY=
665665
k8s.io/code-generator v0.33.10/go.mod h1:FZxuAGEFQTevqv/sfS5bCGvEgEA4NOCUPzlWteBuS74=
666666
k8s.io/component-base v0.33.10 h1:lqF51ldyCT3723fwmFZ3B/GLEY4s33VBjrw2GOGyfIA=
667667
k8s.io/component-base v0.33.10/go.mod h1:SXzog0UR4MeP6ZwZFdt7g64X83BS+brXdDHQ6m4Tnd0=
668+
k8s.io/component-helpers v0.33.10 h1:Ex8lzQEaBKlKUBrLzGGkSWPPb7QCnnNdX52ZxuqVgv4=
669+
k8s.io/component-helpers v0.33.10/go.mod h1:5B0x9WJSnXZfRWXcsia+zUhpsfFSvqobNV2PiKpe01E=
670+
k8s.io/controller-manager v0.33.10 h1:FlF+jFmWcy7KsSm1x5vtImkMAj8dEWAFRTLlIzFH+bY=
671+
k8s.io/controller-manager v0.33.10/go.mod h1:nckl7CgLnN8vGYHcq3WcJT9aT7J1lR3djmXJPn9beT8=
668672
k8s.io/gengo v0.0.0-20250130153323-76c5745d3511 h1:4eL6zr5VCj71nu2nOuQ6j6m/kqh5WueXBN8daZkNe90=
669673
k8s.io/gengo v0.0.0-20250130153323-76c5745d3511/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
670674
k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7 h1:2OX19X59HxDprNCVrWi6jb7LW1PoqTlYqEq5H2oetog=
@@ -678,6 +682,8 @@ k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUy
678682
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8=
679683
k8s.io/kubectl v0.33.10 h1:Zqps9LLwmkarzSTkzi/4L4U/XlM5PLAfHpZtyKqbCQo=
680684
k8s.io/kubectl v0.33.10/go.mod h1:lLqpowGzFZ5fNmzeHxpJpKIzD6t82GleqXMHuep7hBY=
685+
k8s.io/kubernetes v1.33.10 h1:TCsmKmuPY4uu23A5czT5SVhz847lCUddTahsf5VQeM4=
686+
k8s.io/kubernetes v1.33.10/go.mod h1:BV62EkkitqrC6EiWYhJ4CuZiE5LwZZkjdoD7EtkeueA=
681687
k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979 h1:jgJW5IePPXLGB8e/1wvd0Ich9QE97RvvF3a8J3fP/Lg=
682688
k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
683689
oras.land/oras-go/v2 v2.6.0 h1:X4ELRsiGkrbeox69+9tzTu492FMUu7zJQW6eJU+I2oc=

integrationtests/go.mod

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,11 @@ require (
256256
k8s.io/apiserver v0.33.10 // indirect
257257
k8s.io/cli-runtime v0.33.10 // indirect
258258
k8s.io/component-base v0.33.10 // indirect
259+
k8s.io/component-helpers v0.33.10 // indirect
260+
k8s.io/controller-manager v0.33.10 // indirect
259261
k8s.io/klog/v2 v2.130.1 // indirect
260262
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
263+
k8s.io/kubernetes v1.33.10 // indirect
261264
k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979 // indirect
262265
oras.land/oras-go/v2 v2.6.0 // indirect
263266
sigs.k8s.io/cli-utils v0.37.2 // indirect

integrationtests/go.sum

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -683,12 +683,18 @@ k8s.io/client-go v0.33.10 h1:Q3KkTB0zPnGlrs6mS2p6LaJ2zM5ehBVz0JO9ZKQied0=
683683
k8s.io/client-go v0.33.10/go.mod h1:pEg4JnHgHR+m6tZ23SUWj+md2iPdszmVG8KD9/pHtec=
684684
k8s.io/component-base v0.33.10 h1:lqF51ldyCT3723fwmFZ3B/GLEY4s33VBjrw2GOGyfIA=
685685
k8s.io/component-base v0.33.10/go.mod h1:SXzog0UR4MeP6ZwZFdt7g64X83BS+brXdDHQ6m4Tnd0=
686+
k8s.io/component-helpers v0.33.10 h1:Ex8lzQEaBKlKUBrLzGGkSWPPb7QCnnNdX52ZxuqVgv4=
687+
k8s.io/component-helpers v0.33.10/go.mod h1:5B0x9WJSnXZfRWXcsia+zUhpsfFSvqobNV2PiKpe01E=
688+
k8s.io/controller-manager v0.33.10 h1:FlF+jFmWcy7KsSm1x5vtImkMAj8dEWAFRTLlIzFH+bY=
689+
k8s.io/controller-manager v0.33.10/go.mod h1:nckl7CgLnN8vGYHcq3WcJT9aT7J1lR3djmXJPn9beT8=
686690
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
687691
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
688692
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUyGcf03XZEP0ZIKgKj35LS4=
689693
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8=
690694
k8s.io/kubectl v0.33.10 h1:Zqps9LLwmkarzSTkzi/4L4U/XlM5PLAfHpZtyKqbCQo=
691695
k8s.io/kubectl v0.33.10/go.mod h1:lLqpowGzFZ5fNmzeHxpJpKIzD6t82GleqXMHuep7hBY=
696+
k8s.io/kubernetes v1.33.10 h1:TCsmKmuPY4uu23A5czT5SVhz847lCUddTahsf5VQeM4=
697+
k8s.io/kubernetes v1.33.10/go.mod h1:BV62EkkitqrC6EiWYhJ4CuZiE5LwZZkjdoD7EtkeueA=
692698
k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979 h1:jgJW5IePPXLGB8e/1wvd0Ich9QE97RvvF3a8J3fP/Lg=
693699
k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
694700
oras.land/oras-go/v2 v2.6.0 h1:X4ELRsiGkrbeox69+9tzTu492FMUu7zJQW6eJU+I2oc=

0 commit comments

Comments
 (0)