Merge pull request #1033 from Danil-Grigorev/remove-rancher-kubeconfi…

…g-label Remove rancher-kubeconfigs feature
rancher · Jan 23, 2025 · 612a3ad · 612a3ad
2 parents da2656a + 0fd81f6
commit 612a3ad
Show file tree

Hide file tree

Showing 11 changed files with 5 additions and 735 deletions.
diff --git a/.github/workflows/e2e-long.yaml b/.github/workflows/e2e-long.yaml
@@ -31,18 +31,8 @@ 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
   clean_e2e_image:
     if: always()
-    needs: [e2e_import_gitops_v3, e2e_v2prov, e2e_update_labels]
+    needs: [e2e_import_gitops_v3, e2e_v2prov]
     uses: ./.github/workflows/e2e-image-clean.yaml
     secrets: inherit
diff --git a/charts/rancher-turtles/questions.yml b/charts/rancher-turtles/questions.yml
@@ -19,12 +19,6 @@ questions:
         type: boolean
         label: Cleanup CAPI Operator installation
         group: "CAPI Operator 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=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=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
@@ -8,8 +8,6 @@ rancherTurtles:
   rancherInstalled: true
   kubectlImage: registry.k8s.io/kubernetes/kubectl:v1.30.0
   features:
-    rancher-kubeconfigs:
-      label: false
     etcd-snapshot-restore:
       enabled: false
       image: controller

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
-
 	// ExternalFleet allows to disable in-tree management of the Fleet clusters
 	// in the imported rancher clusters, by setting "provisioning.cattle.io/externally-managed"
 	// annotation.
@@ -41,7 +37,6 @@ func init() {
 }
 
 var defaultGates = map[featuregate.Feature]featuregate.FeatureSpec{
-	RancherKubeSecretPatch: {Default: false, PreRelease: featuregate.Beta},
-	ExternalFleet:          {Default: true, PreRelease: featuregate.Beta},
-	AgentTLSMode:           {Default: false, PreRelease: featuregate.Beta},
+	ExternalFleet: {Default: true, PreRelease: featuregate.Beta},
+	AgentTLSMode:  {Default: false, PreRelease: featuregate.Beta},
 }
diff --git a/internal/controllers/import_controller_v3.go b/internal/controllers/import_controller_v3.go
@@ -136,6 +136,7 @@ func (r *CAPIImportManagementV3Reconciler) SetupWithManager(ctx context.Context,
 // +kubebuilder:rbac:groups=infrastructure.cluster.x-k8s.io,resources=*,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=management.cattle.io,resources=clusters;clusters/status;clusterregistrationtokens,verbs=get;list;watch;create;update;delete;deletecollection;patch
 // +kubebuilder:rbac:groups=management.cattle.io,resources=clusterregistrationtokens/status;settings,verbs=get;list;watch
+// +kubebuilder:rbac:groups=provisioning.cattle.io,resources=clusters;clusters/status,verbs=get;list;watch
 //
 //nolint:lll
 

diff --git a/internal/controllers/patch_kcfg_controller.go b/internal/controllers/patch_kcfg_controller.go