Skip to content

[v0.14] Revert false-drift workaround and restore legacyscheme #5007

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

Merged
thardeck merged 3 commits into from
Apr 17, 2026
Merged

[v0.14] Revert false-drift workaround and restore legacyscheme #5007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bf1a179
Revert "[v0.14] Prevent false drift from null field rendering (#4997)"
thardeck Apr 17, 2026
54e0d43
Revert "[v0.14] Remove k8s.io/kubernetes, use client-go scheme (#4902)"
thardeck Apr 17, 2026
8799014
Align k8s.io/kubernetes to v1.34.6 to match other k8s libraries
thardeck Apr 17, 2026
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
10 changes: 0 additions & 10 deletions e2e/assets/gitrepo/helm-recreate-drift-gitrepo.yaml
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions e2e/assets/helm-recreate-drift/chart/Chart.yaml
View file
Open in desktop

This file was deleted.

21 changes: 0 additions & 21 deletions e2e/assets/helm-recreate-drift/chart/templates/deployment.yaml
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions e2e/assets/helm-recreate-drift/fleet.yaml
View file
Open in desktop

This file was deleted.

146 changes: 0 additions & 146 deletions e2e/single-cluster/helm_recreate_drift_test.go
View file
Open in desktop

This file was deleted.

35 changes: 35 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,35 @@ replace (
github.com/imdario/mergo => github.com/imdario/mergo v1.0.2
github.com/rancher/fleet/pkg/apis => ./pkg/apis
gopkg.in/go-playground/webhooks.v6 => github.com/go-playground/webhooks/v6 v6.4.0
k8s.io/api => k8s.io/api v0.34.6
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.34.6
k8s.io/apimachinery => k8s.io/apimachinery v0.34.6
k8s.io/apiserver => k8s.io/apiserver v0.34.6
k8s.io/cli-runtime => k8s.io/cli-runtime v0.34.6
k8s.io/client-go => k8s.io/client-go v0.34.6
k8s.io/cloud-provider => k8s.io/cloud-provider v0.34.6
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.34.6
k8s.io/code-generator => k8s.io/code-generator v0.34.6
k8s.io/component-base => k8s.io/component-base v0.34.6
k8s.io/component-helpers => k8s.io/component-helpers v0.34.6
k8s.io/controller-manager => k8s.io/controller-manager v0.34.6
k8s.io/cri-api => k8s.io/cri-api v0.34.6
k8s.io/cri-client => k8s.io/cri-client v0.34.6
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.34.6
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.34.6
k8s.io/endpointslice => k8s.io/endpointslice v0.34.6
k8s.io/externaljwt => k8s.io/externaljwt v0.34.6
k8s.io/kms => k8s.io/kms v0.34.6
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.34.6
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.34.6
k8s.io/kube-proxy => k8s.io/kube-proxy v0.34.6
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.34.6
k8s.io/kubectl => k8s.io/kubectl v0.34.6
k8s.io/kubelet => k8s.io/kubelet v0.34.6
k8s.io/metrics => k8s.io/metrics v0.34.6
k8s.io/mount-utils => k8s.io/mount-utils v0.34.6
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.34.6
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.34.6
Comment thread
thardeck marked this conversation as resolved.
)

require (
Expand Down Expand Up @@ -60,6 +89,7 @@ require (
k8s.io/klog/v2 v2.130.1
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b
k8s.io/kubectl v0.34.6
k8s.io/kubernetes v1.34.6
Comment thread
thardeck marked this conversation as resolved.
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
oras.land/oras-go/v2 v2.6.0
sigs.k8s.io/cli-utils v0.37.2
Expand Down Expand Up @@ -94,6 +124,7 @@ require (
github.com/containerd/stargz-snapshotter/estargz v0.16.3 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/docker/cli v29.2.0+incompatible // indirect
github.com/docker/distribution v2.8.3+incompatible // indirect
github.com/docker/docker-credential-helpers v0.9.3 // indirect
Expand Down Expand Up @@ -177,6 +208,8 @@ require (
github.com/x448/float16 v0.8.4 // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect
github.com/xlab/treeprint v1.2.0 // indirect
go.opentelemetry.io/otel v1.39.0 // indirect
go.opentelemetry.io/otel/trace v1.39.0 // indirect
go.uber.org/automaxprocs v1.6.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.yaml.in/yaml/v2 v2.4.3 // indirect
Expand All @@ -202,6 +235,8 @@ require (
k8s.io/apiserver v0.34.6 // indirect
k8s.io/code-generator v0.34.6 // indirect
k8s.io/component-base v0.34.6 // indirect
k8s.io/component-helpers v0.34.6 // indirect
k8s.io/controller-manager v0.34.6 // indirect
k8s.io/gengo v0.0.0-20250130153323-76c5745d3511 // indirect
k8s.io/gengo/v2 v2.0.0-20250604051438-85fd79dbfd9f // indirect
k8s.io/helm v2.17.0+incompatible // indirect
Expand Down
6 changes: 6 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,6 +606,10 @@ k8s.io/code-generator v0.34.6 h1:Sff8VcHxpVj/1tvYE7CgL1X7/hHjH2Nnu2//BNVUAaY=
k8s.io/code-generator v0.34.6/go.mod h1:21o4G2tzuXrgpwntJeWA5Nt+H9ADnXvoQ2fwKlfGkfE=
k8s.io/component-base v0.34.6 h1:+hkR1hJI2Bsfp5SbTGmGcKdkGZoa0aX68eMFGeZPUIg=
k8s.io/component-base v0.34.6/go.mod h1:D2fBgLp3Rwe4+P0JTLhRPDJWrWddwTu/aoBT0FMQ75M=
k8s.io/component-helpers v0.34.6 h1:fLYgk0Jpgr7ykcQUL8bomqKtqMCV8lnfqV3iyhjHdsQ=
k8s.io/component-helpers v0.34.6/go.mod h1:eAQxT3xRPZ56H4gLILpuXWKwC92FWhYMOsEtWLQgK9o=
k8s.io/controller-manager v0.34.6 h1:e+qcnaGyOThkEMPL+GJ8IiPRDuSPDLgc9FbpvShcOl0=
k8s.io/controller-manager v0.34.6/go.mod h1:PTc8yq8l80jp7dGFh8spdJVKAzNCcS13CceylpG7bMs=
k8s.io/gengo v0.0.0-20250130153323-76c5745d3511 h1:4eL6zr5VCj71nu2nOuQ6j6m/kqh5WueXBN8daZkNe90=
k8s.io/gengo v0.0.0-20250130153323-76c5745d3511/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
k8s.io/gengo/v2 v2.0.0-20250604051438-85fd79dbfd9f h1:SLb+kxmzfA87x4E4brQzB33VBbT2+x7Zq9ROIHmGn9Q=
Expand All @@ -619,6 +623,8 @@ k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b h1:MloQ9/bdJyIu9lb1PzujOP
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b/go.mod h1:UZ2yyWbFTpuhSbFhv24aGNOdoRdJZgsIObGBUaYVsts=
k8s.io/kubectl v0.34.6 h1:IxLtdBssejoWWeG7zCDiDc2E+aKG6S69ue/kCOHZi6I=
k8s.io/kubectl v0.34.6/go.mod h1:Vw5UnMi+lgzXv5sfBycy/BdkPP451DmvarxnMJaMJQA=
k8s.io/kubernetes v1.34.6 h1:zghBAjObluxBc5bkVXXvTA+fn9dkYSIq1QvzTAOWvsw=
k8s.io/kubernetes v1.34.6/go.mod h1:m6pZk6a179pRo2wsTiCPORJ86iOEQmfIzUvtyEF8BwA=
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y=
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
oras.land/oras-go/v2 v2.6.0 h1:X4ELRsiGkrbeox69+9tzTu492FMUu7zJQW6eJU+I2oc=
Expand Down
32 changes: 32 additions & 0 deletions integrationtests/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,35 @@ toolchain go1.25.9
replace (
github.com/rancher/fleet => ../
github.com/rancher/fleet/pkg/apis => ../pkg/apis
k8s.io/api => k8s.io/api v0.34.6
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.34.6
k8s.io/apimachinery => k8s.io/apimachinery v0.34.6
k8s.io/apiserver => k8s.io/apiserver v0.34.6
k8s.io/cli-runtime => k8s.io/cli-runtime v0.34.6
k8s.io/client-go => k8s.io/client-go v0.34.6
k8s.io/cloud-provider => k8s.io/cloud-provider v0.34.6
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.34.6
k8s.io/code-generator => k8s.io/code-generator v0.34.6
k8s.io/component-base => k8s.io/component-base v0.34.6
k8s.io/component-helpers => k8s.io/component-helpers v0.34.6
k8s.io/controller-manager => k8s.io/controller-manager v0.34.6
k8s.io/cri-api => k8s.io/cri-api v0.34.6
Comment thread
thardeck marked this conversation as resolved.
k8s.io/cri-client => k8s.io/cri-client v0.34.6
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.34.6
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.34.6
k8s.io/endpointslice => k8s.io/endpointslice v0.34.6
k8s.io/externaljwt => k8s.io/externaljwt v0.34.6
k8s.io/kms => k8s.io/kms v0.34.6
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.34.6
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.34.6
k8s.io/kube-proxy => k8s.io/kube-proxy v0.34.6
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.34.6
k8s.io/kubectl => k8s.io/kubectl v0.34.6
k8s.io/kubelet => k8s.io/kubelet v0.34.6
k8s.io/metrics => k8s.io/metrics v0.34.6
k8s.io/mount-utils => k8s.io/mount-utils v0.34.6
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.34.6
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.34.6
)

require (
Expand Down Expand Up @@ -217,8 +246,11 @@ require (
k8s.io/apiserver v0.34.6 // indirect
k8s.io/cli-runtime v0.34.6 // indirect
k8s.io/component-base v0.34.6 // indirect
k8s.io/component-helpers v0.34.6 // indirect
k8s.io/controller-manager v0.34.6 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
k8s.io/kubernetes v1.34.6 // indirect
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
oras.land/oras-go/v2 v2.6.0 // indirect
sigs.k8s.io/cli-utils v0.37.2 // indirect
Expand Down
6 changes: 6 additions & 0 deletions integrationtests/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,12 +616,18 @@ k8s.io/client-go v0.34.6 h1:8aF4tJiZolSdliT5nhJnBx49Om2ET3Tn3/JKKpJk4gI=
k8s.io/client-go v0.34.6/go.mod h1:ZntANq4HsaiOD0rIhLHTdZT/aLkv4NVyI/glqocESTQ=
k8s.io/component-base v0.34.6 h1:+hkR1hJI2Bsfp5SbTGmGcKdkGZoa0aX68eMFGeZPUIg=
k8s.io/component-base v0.34.6/go.mod h1:D2fBgLp3Rwe4+P0JTLhRPDJWrWddwTu/aoBT0FMQ75M=
k8s.io/component-helpers v0.34.6 h1:fLYgk0Jpgr7ykcQUL8bomqKtqMCV8lnfqV3iyhjHdsQ=
k8s.io/component-helpers v0.34.6/go.mod h1:eAQxT3xRPZ56H4gLILpuXWKwC92FWhYMOsEtWLQgK9o=
k8s.io/controller-manager v0.34.6 h1:e+qcnaGyOThkEMPL+GJ8IiPRDuSPDLgc9FbpvShcOl0=
k8s.io/controller-manager v0.34.6/go.mod h1:PTc8yq8l80jp7dGFh8spdJVKAzNCcS13CceylpG7bMs=
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b h1:MloQ9/bdJyIu9lb1PzujOPolHyvO06MXG5TUIj2mNAA=
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b/go.mod h1:UZ2yyWbFTpuhSbFhv24aGNOdoRdJZgsIObGBUaYVsts=
k8s.io/kubectl v0.34.6 h1:IxLtdBssejoWWeG7zCDiDc2E+aKG6S69ue/kCOHZi6I=
k8s.io/kubectl v0.34.6/go.mod h1:Vw5UnMi+lgzXv5sfBycy/BdkPP451DmvarxnMJaMJQA=
k8s.io/kubernetes v1.34.6 h1:zghBAjObluxBc5bkVXXvTA+fn9dkYSIq1QvzTAOWvsw=
k8s.io/kubernetes v1.34.6/go.mod h1:m6pZk6a179pRo2wsTiCPORJ86iOEQmfIzUvtyEF8BwA=
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y=
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
oras.land/oras-go/v2 v2.6.0 h1:X4ELRsiGkrbeox69+9tzTu492FMUu7zJQW6eJU+I2oc=
Expand Down
Loading
Loading