Merge pull request #1993 from slashpai/metrics-server

openshift-merge-bot[bot] · web-flow · commit 684b2b1679ba · 2024-10-24T19:13:14.000Z
MON-3971: Remove MetricsServer feature gate
diff --git a/features.md b/features.md
@@ -66,7 +66,6 @@
 | 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>  |
 | KMSv1| <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>  |
 | ManagedBootImages| <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>  |
-| MetricsServer| <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>  |
 | MultiArchInstallAWS| <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>  |
 | MultiArchInstallGCP| <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>  |
 | NetworkDiagnosticsConfig| <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>  |
diff --git a/features/features.go b/features/features.go
@@ -337,14 +337,6 @@ var (
 					enhancementPR(legacyFeatureGateWithoutEnhancement).
 					mustRegister()
 
-	FeatureGateMetricsServer = newFeatureGate("MetricsServer").
-					reportProblemsToJiraComponent("Monitoring").
-					contactPerson("slashpai").
-					productScope(ocpSpecific).
-					enhancementPR(legacyFeatureGateWithoutEnhancement).
-					enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-					mustRegister()
-
 	FeatureGateGCPClusterHostedDNS = newFeatureGate("GCPClusterHostedDNS").
 					reportProblemsToJiraComponent("Installer").
 					contactPerson("barbacbd").
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
@@ -213,9 +213,6 @@
                     {
                         "name": "ManagedBootImages"
                     },
-                    {
-                        "name": "MetricsServer"
-                    },
                     {
                         "name": "MultiArchInstallAWS"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
@@ -149,9 +149,6 @@
                     {
                         "name": "MetricsCollectionProfiles"
                     },
-                    {
-                        "name": "MetricsServer"
-                    },
                     {
                         "name": "MixedCPUsAllocation"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
@@ -149,9 +149,6 @@
                     {
                         "name": "MetricsCollectionProfiles"
                     },
-                    {
-                        "name": "MetricsServer"
-                    },
                     {
                         "name": "MixedCPUsAllocation"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
@@ -213,9 +213,6 @@
                     {
                         "name": "ManagedBootImages"
                     },
-                    {
-                        "name": "MetricsServer"
-                    },
                     {
                         "name": "MultiArchInstallAWS"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
@@ -149,9 +149,6 @@
                     {
                         "name": "MetricsCollectionProfiles"
                     },
-                    {
-                        "name": "MetricsServer"
-                    },
                     {
                         "name": "MixedCPUsAllocation"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
@@ -149,9 +149,6 @@
                     {
                         "name": "MetricsCollectionProfiles"
                     },
-                    {
-                        "name": "MetricsServer"
-                    },
                     {
                         "name": "MixedCPUsAllocation"
                     },

Original file line number	Diff line number	Diff line change
`@@ -213,9 +213,6 @@`
`213`	`213`	`{`
`214`	`214`	`"name": "ManagedBootImages"`
`215`	`215`	`},`
`216`		`- {`
`217`		`- "name": "MetricsServer"`
`218`		`- },`
`219`	`216`	`{`
`220`	`217`	`"name": "MultiArchInstallAWS"`
`221`	`218`	`},`
Original file line number	Diff line number	Diff line change
`@@ -149,9 +149,6 @@`
`149`	`149`	`{`
`150`	`150`	`"name": "MetricsCollectionProfiles"`
`151`	`151`	`},`
`152`		`- {`
`153`		`- "name": "MetricsServer"`
`154`		`- },`
`155`	`152`	`{`
`156`	`153`	`"name": "MixedCPUsAllocation"`
`157`	`154`	`},`