fixup! MON-3486: add feature gate for Collection Profiles

openshift · Jan 17, 2024 · 0aeefbc · 0aeefbc
1 parent 5eb761f
commit 0aeefbc
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/config/v1/feature_gates.go b/config/v1/feature_gates.go
@@ -442,10 +442,10 @@ var (
 		OwningProduct:       ocpSpecific,
 	}
 
-	FeatureGateCollectionProfiles = FeatureGateName("CollectionProfiles")
-	collectionProfiles            = FeatureGateDescription{
+	FeatureGateMetricsCollectionProfiles = FeatureGateName("MetricsCollectionProfiles")
+	metricsCollectionProfiles            = FeatureGateDescription{
 		FeatureGateAttributes: FeatureGateAttributes{
-			Name: FeatureGateCollectionProfiles,
+			Name: FeatureGateMetricsCollectionProfiles,
 		},
 		OwningJiraComponent: "Monitoring",
 		ResponsiblePerson:   "rexagod",

diff --git a/config/v1/types_feature.go b/config/v1/types_feature.go
@@ -187,7 +187,7 @@ var FeatureSets = map[FeatureSet]*FeatureGateEnabledDisabled{
 		with(machineConfigNodes).
 		with(metricsServer).
 		with(installAlternateInfrastructureAWS).
-		with(collectionProfiles).
+		with(metricsCollectionProfiles).
 		without(clusterAPIInstall).
 		with(sdnLiveMigration).
 		with(mixedCPUsAllocation).

diff --git a/payload-manifests/featuregates/featureGate-Default.yaml b/payload-manifests/featuregates/featureGate-Default.yaml
@@ -64,6 +64,9 @@
                     {
                         "name": "MaxUnavailableStatefulSet"
                     },
+                    {
+                        "name": "MetricsCollectionProfiles"
+                    },
                     {
                         "name": "MetricsServer"
                     },

diff --git a/payload-manifests/featuregates/featureGate-LatencySensitive.yaml b/payload-manifests/featuregates/featureGate-LatencySensitive.yaml
@@ -66,6 +66,9 @@
                     {
                         "name": "MaxUnavailableStatefulSet"
                     },
+                    {
+                        "name": "MetricsCollectionProfiles"
+                    },
                     {
                         "name": "MetricsServer"
                     },

diff --git a/payload-manifests/featuregates/featureGate-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-TechPreviewNoUpgrade.yaml
@@ -95,6 +95,9 @@
                     {
                         "name": "MaxUnavailableStatefulSet"
                     },
+                    {
+                        "name": "MetricsCollectionProfiles"
+                    },
                     {
                         "name": "MetricsServer"
                     },