Merge pull request openshift#1889 from barbacbd/CORS-3488

CORS-3488: Add GCP CAPI installer to tech preview feature set.
openshift-cherrypick-robot · May 14, 2024 · 944467d · 944467d
2 parents 88a8afe + 6754b27
commit 944467d
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 13 deletions.
diff --git a/features.md b/features.md
@@ -2,14 +2,14 @@
 | ------ | --- | --- | --- | --- | --- | ---  |
 | ClusterAPIInstall| | | | | |  |
 | ClusterAPIInstallAzure| | | | | |  |
-| ClusterAPIInstallGCP| | | | | |  |
 | ClusterAPIInstallIBMCloud| | | | | |  |
 | EventedPLEG| | | | | |  |
 | MachineAPIOperatorDisableMachineHealthCheckController| | | | | |  |
 | AutomatedEtcdBackup| | | <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>  |
 | CSIDriverSharedResource| | | <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>  |
 | ChunkSizeMiB| | | <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>  |
 | ClusterAPIInstallAWS| | | <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>  |
+| ClusterAPIInstallGCP| | | <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>  |
 | ClusterAPIInstallNutanix| | | <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>  |
 | ClusterAPIInstallOpenStack| | | <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>  |
 | 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>  |

diff --git a/features/features.go b/features/features.go
@@ -492,6 +492,7 @@ var (
 					reportProblemsToJiraComponent("Installer").
 					contactPerson("bfournie").
 					productScope(ocpSpecific).
+					enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
 					mustRegister()
 
 	FeatureGateClusterAPIInstallIBMCloud = newFeatureGate("ClusterAPIInstallIBMCloud").

diff --git a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
@@ -21,9 +21,6 @@
                     {
                         "name": "ClusterAPIInstallAzure"
                     },
-                    {
-                        "name": "ClusterAPIInstallGCP"
-                    },
                     {
                         "name": "ClusterAPIInstallIBMCloud"
                     },
@@ -65,6 +62,9 @@
                     {
                         "name": "ClusterAPIInstallAWS"
                     },
+                    {
+                        "name": "ClusterAPIInstallGCP"
+                    },
                     {
                         "name": "ClusterAPIInstallNutanix"
                     },

diff --git a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
@@ -21,9 +21,6 @@
                     {
                         "name": "ClusterAPIInstallAzure"
                     },
-                    {
-                        "name": "ClusterAPIInstallGCP"
-                    },
                     {
                         "name": "ClusterAPIInstallIBMCloud"
                     },
@@ -65,6 +62,9 @@
                     {
                         "name": "ClusterAPIInstallAWS"
                     },
+                    {
+                        "name": "ClusterAPIInstallGCP"
+                    },
                     {
                         "name": "ClusterAPIInstallNutanix"
                     },

diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
@@ -21,9 +21,6 @@
                     {
                         "name": "ClusterAPIInstallAzure"
                     },
-                    {
-                        "name": "ClusterAPIInstallGCP"
-                    },
                     {
                         "name": "ClusterAPIInstallIBMCloud"
                     },
@@ -65,6 +62,9 @@
                     {
                         "name": "ClusterAPIInstallAWS"
                     },
+                    {
+                        "name": "ClusterAPIInstallGCP"
+                    },
                     {
                         "name": "ClusterAPIInstallNutanix"
                     },

diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
@@ -21,9 +21,6 @@
                     {
                         "name": "ClusterAPIInstallAzure"
                     },
-                    {
-                        "name": "ClusterAPIInstallGCP"
-                    },
                     {
                         "name": "ClusterAPIInstallIBMCloud"
                     },
@@ -65,6 +62,9 @@
                     {
                         "name": "ClusterAPIInstallAWS"
                     },
+                    {
+                        "name": "ClusterAPIInstallGCP"
+                    },
                     {
                         "name": "ClusterAPIInstallNutanix"
                     },