Skip to content

Commit 2c10e58

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1780 from JoelSpeed/remove-cloud-fg
OCPCLOUD-2561: Remove CloudProviderExternal feature gates
2 parents 65532e7 + 227592a commit 2c10e58

8 files changed

+5
-109
lines changed

‎features.md‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,6 @@
6262
| ClusterAPIInstallPowerVS| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
6363
| ClusterAPIInstallVSphere| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
6464
| DisableKubeletCloudCredentialProviders| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
65-
| ExternalCloudProvider| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
66-
| ExternalCloudProviderAzure| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
67-
| ExternalCloudProviderExternal| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
68-
| ExternalCloudProviderGCP| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
6965
| GCPLabelsTags| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
7066
| HardwareSpeed| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
7167
| IngressControllerLBSubnetsAWS| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |

‎features/features.go‎

Lines changed: 5 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -71,34 +71,6 @@ var (
7171
enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
7272
mustRegister()
7373

74-
FeatureGateExternalCloudProvider = newFeatureGate("ExternalCloudProvider").
75-
reportProblemsToJiraComponent("cloud-provider").
76-
contactPerson("jspeed").
77-
productScope(ocpSpecific).
78-
enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
79-
mustRegister()
80-
81-
FeatureGateExternalCloudProviderAzure = newFeatureGate("ExternalCloudProviderAzure").
82-
reportProblemsToJiraComponent("cloud-provider").
83-
contactPerson("jspeed").
84-
productScope(ocpSpecific).
85-
enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
86-
mustRegister()
87-
88-
FeatureGateExternalCloudProviderGCP = newFeatureGate("ExternalCloudProviderGCP").
89-
reportProblemsToJiraComponent("cloud-provider").
90-
contactPerson("jspeed").
91-
productScope(ocpSpecific).
92-
enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
93-
mustRegister()
94-
95-
FeatureGateExternalCloudProviderExternal = newFeatureGate("ExternalCloudProviderExternal").
96-
reportProblemsToJiraComponent("cloud-provider").
97-
contactPerson("elmiko").
98-
productScope(ocpSpecific).
99-
enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
100-
mustRegister()
101-
10274
FeatureGateCSIDriverSharedResource = newFeatureGate("CSIDriverSharedResource").
10375
reportProblemsToJiraComponent("builds").
10476
contactPerson("adkaplan").
@@ -612,9 +584,9 @@ var (
612584
enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
613585
mustRegister()
614586
FeatureGateImageStreamImportMode = newFeatureGate("ImageStreamImportMode").
615-
reportProblemsToJiraComponent("Multi-Arch").
616-
contactPerson("psundara").
617-
productScope(ocpSpecific).
618-
enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
619-
mustRegister()
587+
reportProblemsToJiraComponent("Multi-Arch").
588+
contactPerson("psundara").
589+
productScope(ocpSpecific).
590+
enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
591+
mustRegister()
620592
)

‎payload-manifests/featuregates/featureGate-Hypershift-Default.yaml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -198,18 +198,6 @@
198198
{
199199
"name": "DisableKubeletCloudCredentialProviders"
200200
},
201-
{
202-
"name": "ExternalCloudProvider"
203-
},
204-
{
205-
"name": "ExternalCloudProviderAzure"
206-
},
207-
{
208-
"name": "ExternalCloudProviderExternal"
209-
},
210-
{
211-
"name": "ExternalCloudProviderGCP"
212-
},
213201
{
214202
"name": "ExternalOIDC"
215203
},

‎payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -110,18 +110,6 @@
110110
{
111111
"name": "Example"
112112
},
113-
{
114-
"name": "ExternalCloudProvider"
115-
},
116-
{
117-
"name": "ExternalCloudProviderAzure"
118-
},
119-
{
120-
"name": "ExternalCloudProviderExternal"
121-
},
122-
{
123-
"name": "ExternalCloudProviderGCP"
124-
},
125113
{
126114
"name": "ExternalOIDC"
127115
},

‎payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -113,18 +113,6 @@
113113
{
114114
"name": "Example"
115115
},
116-
{
117-
"name": "ExternalCloudProvider"
118-
},
119-
{
120-
"name": "ExternalCloudProviderAzure"
121-
},
122-
{
123-
"name": "ExternalCloudProviderExternal"
124-
},
125-
{
126-
"name": "ExternalCloudProviderGCP"
127-
},
128116
{
129117
"name": "ExternalOIDC"
130118
},

‎payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -201,18 +201,6 @@
201201
{
202202
"name": "DisableKubeletCloudCredentialProviders"
203203
},
204-
{
205-
"name": "ExternalCloudProvider"
206-
},
207-
{
208-
"name": "ExternalCloudProviderAzure"
209-
},
210-
{
211-
"name": "ExternalCloudProviderExternal"
212-
},
213-
{
214-
"name": "ExternalCloudProviderGCP"
215-
},
216204
{
217205
"name": "GCPLabelsTags"
218206
},

‎payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -110,18 +110,6 @@
110110
{
111111
"name": "Example"
112112
},
113-
{
114-
"name": "ExternalCloudProvider"
115-
},
116-
{
117-
"name": "ExternalCloudProviderAzure"
118-
},
119-
{
120-
"name": "ExternalCloudProviderExternal"
121-
},
122-
{
123-
"name": "ExternalCloudProviderGCP"
124-
},
125113
{
126114
"name": "ExternalOIDC"
127115
},

‎payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -113,18 +113,6 @@
113113
{
114114
"name": "Example"
115115
},
116-
{
117-
"name": "ExternalCloudProvider"
118-
},
119-
{
120-
"name": "ExternalCloudProviderAzure"
121-
},
122-
{
123-
"name": "ExternalCloudProviderExternal"
124-
},
125-
{
126-
"name": "ExternalCloudProviderGCP"
127-
},
128116
{
129117
"name": "ExternalOIDC"
130118
},

0 commit comments

Comments
 (0)