Remove rancher-kubeconfigs feature

Current rancher version used with turtles uses CAPI 1.9, so the feature is no longer needed and thus removed. Signed-off-by: Danil-Grigorev <[email protected]>
rancher · Jan 22, 2025 · 6822bc8 · 6822bc8
1 parent 53057d4
commit 6822bc8
Show file tree

Hide file tree

Showing 10 changed files with 4 additions and 735 deletions.
diff --git a/.github/workflows/e2e-long.yaml b/.github/workflows/e2e-long.yaml
@@ -31,16 +31,6 @@ jobs:
       artifact_name: artifacts_v2prov
       MANAGEMENT_CLUSTER_ENVIRONMENT: eks
     secrets: inherit
-  e2e_update_labels:
-    needs: publish_e2e_image
-    uses: ./.github/workflows/run-e2e-suite.yaml
-    with:
-      test_suite: test/e2e/suites/update-labels
-      test_name: Update labels
-      run_azure_janitor: false
-      artifact_name: artifacts_update_labels
-      MANAGEMENT_CLUSTER_ENVIRONMENT: eks
-    secrets: inherit
   e2e_embedded_capi_disabled_v3:
     needs: publish_e2e_image
     uses: ./.github/workflows/run-e2e-suite.yaml

diff --git a/charts/rancher-turtles/questions.yml b/charts/rancher-turtles/questions.yml
@@ -41,12 +41,6 @@ questions:
       type: string
       label: Webhook Cleanup Image
       group: "Rancher webhook cleanup settings"
-  - variable: rancherTurtles.features.rancher-kubeconfigs.label
-    default: false
-    description: "(Experimental) Specify that the kubeconfigs generated by Rancher should be automatically patched to contain the CAPI expected labels"
-    type: boolean
-    label: Label Rancher Kubeconfigs
-    group: "Rancher Turtles Features Settings"
   - variable: cluster-api-operator.cluster-api.rke2.enabled
     default: "true"
     description: "Flag to enable or disable installation of the RKE2 provider for Cluster API. By default this is enabled."

diff --git a/charts/rancher-turtles/templates/deployment.yaml b/charts/rancher-turtles/templates/deployment.yaml
@@ -26,7 +26,7 @@ spec:
       containers:
       - args:
         - --leader-elect
-        - --feature-gates=propagate-labels={{ index .Values "rancherTurtles" "features" "propagate-labels" "enabled"}},rancher-kube-secret-patch={{ index .Values "rancherTurtles" "features" "rancher-kubeconfigs" "label"}},addon-provider-fleet={{ index .Values "rancherTurtles" "features" "addon-provider-fleet" "enabled"}},agent-tls-mode={{ index .Values "rancherTurtles" "features" "agent-tls-mode" "enabled"}}
+        - --feature-gates=propagate-labels={{ index .Values "rancherTurtles" "features" "propagate-labels" "enabled"}},addon-provider-fleet={{ index .Values "rancherTurtles" "features" "addon-provider-fleet" "enabled"}},agent-tls-mode={{ index .Values "rancherTurtles" "features" "agent-tls-mode" "enabled"}}
         {{- range .Values.rancherTurtles.managerArguments }}
         - {{ . }}
         {{- end }}  

diff --git a/charts/rancher-turtles/values.yaml b/charts/rancher-turtles/values.yaml
@@ -12,8 +12,6 @@ rancherTurtles:
     rancher-webhook:
       cleanup: true
       kubectlImage: registry.k8s.io/kubernetes/kubectl:v1.30.0
-    rancher-kubeconfigs:
-      label: false
     propagate-labels:
       enabled: false
     etcd-snapshot-restore:

diff --git a/feature/feature.go b/feature/feature.go
@@ -22,10 +22,6 @@ import (
 )
 
 const (
-	// RancherKubeSecretPatch is used to enable patching of the Rancher v2prov created kubeconfig
-	// secrets so that they can be used with CAPI 1.5.x.
-	RancherKubeSecretPatch featuregate.Feature = "rancher-kube-secret-patch" //nolint:gosec
-
 	// PropagateLabels is used to enable copying the labels from the CAPI cluster
 	// to the Rancher cluster.
 	PropagateLabels featuregate.Feature = "propagate-labels"
@@ -45,8 +41,7 @@ func init() {
 }
 
 var defaultGates = map[featuregate.Feature]featuregate.FeatureSpec{
-	RancherKubeSecretPatch: {Default: false, PreRelease: featuregate.Beta},
-	PropagateLabels:        {Default: false, PreRelease: featuregate.Beta},
-	ExternalFleet:          {Default: true, PreRelease: featuregate.Beta},
-	AgentTLSMode:           {Default: false, PreRelease: featuregate.Beta},
+	PropagateLabels: {Default: false, PreRelease: featuregate.Beta},
+	ExternalFleet:   {Default: true, PreRelease: featuregate.Beta},
+	AgentTLSMode:    {Default: false, PreRelease: featuregate.Beta},
 }
diff --git a/internal/controllers/patch_kcfg_controller.go b/internal/controllers/patch_kcfg_controller.go