From 5fe36545cd9486c4e1da3cd033309a6e3840a2fc Mon Sep 17 00:00:00 2001
From: Joel Speed <joel.speed@hotmail.co.uk>
Date: Mon, 4 Dec 2023 14:21:03 +0000
Subject: [PATCH] Set DisableKubeletCloudCredentialProviders upstream feature
 gate to False

---
 config/v1/feature_gates.go | 10 ++++++++++
 config/v1/types_feature.go | 11 ++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/config/v1/feature_gates.go b/config/v1/feature_gates.go
index 51e826f7e02..5f323eb68da 100644
--- a/config/v1/feature_gates.go
+++ b/config/v1/feature_gates.go
@@ -381,4 +381,14 @@ var (
 		ResponsiblePerson:   "djoshy",
 		OwningProduct:       ocpSpecific,
 	}
+
+	FeatureGateDisableKubeletCloudCredentialProviders = FeatureGateName("DisableKubeletCloudCredentialProviders")
+	disableKubeletCloudCredentialProviders            = FeatureGateDescription{
+		FeatureGateAttributes: FeatureGateAttributes{
+			Name: FeatureGateDisableKubeletCloudCredentialProviders,
+		},
+		OwningJiraComponent: "cloud-provider",
+		ResponsiblePerson:   "jspeed",
+		OwningProduct:       kubernetes,
+	}
 )
diff --git a/config/v1/types_feature.go b/config/v1/types_feature.go
index a2f0623a0bd..55a23b3986e 100644
--- a/config/v1/types_feature.go
+++ b/config/v1/types_feature.go
@@ -159,8 +159,10 @@ type FeatureGateEnabledDisabled struct {
 var FeatureSets = map[FeatureSet]*FeatureGateEnabledDisabled{
 	Default: defaultFeatures,
 	CustomNoUpgrade: {
-		Enabled:  []FeatureGateDescription{},
-		Disabled: []FeatureGateDescription{},
+		Enabled: []FeatureGateDescription{},
+		Disabled: []FeatureGateDescription{
+			disableKubeletCloudCredentialProviders, // We do not currently ship the correct config to use the external credentials provider.
+		},
 	},
 	TechPreviewNoUpgrade: newDefaultFeatures().
 		with(validatingAdmissionPolicy).
@@ -189,6 +191,7 @@ var FeatureSets = map[FeatureSet]*FeatureGateEnabledDisabled{
 		with(sdnLiveMigration).
 		with(mixedCPUsAllocation).
 		with(managedBootImages).
+		without(disableKubeletCloudCredentialProviders).
 		toFeatures(defaultFeatures),
 	LatencySensitive: newDefaultFeatures().
 		toFeatures(defaultFeatures),
@@ -207,7 +210,9 @@ var defaultFeatures = &FeatureGateEnabledDisabled{
 		privateHostedZoneAWS,
 		buildCSIVolumes,
 	},
-	Disabled: []FeatureGateDescription{},
+	Disabled: []FeatureGateDescription{
+		disableKubeletCloudCredentialProviders, // We do not currently ship the correct config to use the external credentials provider.
+	},
 }
 
 type featureSetBuilder struct {