Enables kubelet cloud credential providers

openshift · Mar 8, 2024 · d3a560f · d3a560f
1 parent 610cbc7
commit d3a560f
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/config/v1/types_feature.go b/config/v1/types_feature.go
@@ -159,10 +159,8 @@ type FeatureGateEnabledDisabled struct {
 var FeatureSets = map[FeatureSet]*FeatureGateEnabledDisabled{
 	Default: defaultFeatures,
 	CustomNoUpgrade: {
-		Enabled: []FeatureGateDescription{},
-		Disabled: []FeatureGateDescription{
-			disableKubeletCloudCredentialProviders, // We do not currently ship the correct config to use the external credentials provider.
-		},
+		Enabled:  []FeatureGateDescription{},
+		Disabled: []FeatureGateDescription{},
 	},
 	TechPreviewNoUpgrade: newDefaultFeatures().
 		with(validatingAdmissionPolicy).
@@ -189,7 +187,6 @@ var FeatureSets = map[FeatureSet]*FeatureGateEnabledDisabled{
 		without(clusterAPIInstall).
 		with(mixedCPUsAllocation).
 		with(managedBootImages).
-		without(disableKubeletCloudCredentialProviders).
 		with(onClusterBuild).
 		with(signatureStores).
 		with(pinnedImages).
@@ -216,10 +213,9 @@ var defaultFeatures = &FeatureGateEnabledDisabled{
 		kmsv1,
 		vSphereControlPlaneMachineset,
 		sdnLiveMigration,
+		disableKubeletCloudCredentialProviders,
 	},
-	Disabled: []FeatureGateDescription{
-		disableKubeletCloudCredentialProviders, // We do not currently ship the correct config to use the external credentials provider.
-	},
+	Disabled: []FeatureGateDescription{},
 }
 
 type featureSetBuilder struct {