Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 10 additions & 0 deletions config/v1/feature_gates.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
)
11 changes: 8 additions & 3 deletions config/v1/types_feature.go
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down Expand Up @@ -189,6 +191,7 @@ var FeatureSets = map[FeatureSet]*FeatureGateEnabledDisabled{
with(sdnLiveMigration).
with(mixedCPUsAllocation).
with(managedBootImages).
without(disableKubeletCloudCredentialProviders).
toFeatures(defaultFeatures),
LatencySensitive: newDefaultFeatures().
toFeatures(defaultFeatures),
Expand All @@ -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 {
Expand Down