From d0f74a9973795a1bc13ab4d19bf5d0f83e81300d Mon Sep 17 00:00:00 2001 From: Jordan Keister Date: Wed, 12 Feb 2025 16:00:51 -0600 Subject: [PATCH 1/2] featuregate for catalogd metas web api Signed-off-by: Jordan Keister --- features.md | 1 + features/features.go | 8 ++++++++ .../featuregates/featureGate-Hypershift-Default.yaml | 3 +++ .../featureGate-Hypershift-DevPreviewNoUpgrade.yaml | 3 +++ .../featureGate-Hypershift-TechPreviewNoUpgrade.yaml | 3 +++ .../featuregates/featureGate-SelfManagedHA-Default.yaml | 3 +++ .../featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml | 3 +++ .../featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml | 3 +++ 8 files changed, 27 insertions(+) diff --git a/features.md b/features.md index 4e79885d888..6c074809311 100644 --- a/features.md +++ b/features.md @@ -8,6 +8,7 @@ | MultiArchInstallAzure| | | | | | | | ClusterVersionOperatorConfiguration| | | Enabled | Enabled | | | | Example2| | | Enabled | Enabled | | | +| NewOLMCatalogdMetas| | | Enabled | | Enabled | | | NewOLM| | Enabled | | Enabled | | Enabled | | AWSClusterHostedDNS| | | Enabled | Enabled | Enabled | Enabled | | AutomatedEtcdBackup| | | Enabled | Enabled | Enabled | Enabled | diff --git a/features/features.go b/features/features.go index d6a78b2a09b..71346aa42fb 100644 --- a/features/features.go +++ b/features/features.go @@ -522,6 +522,14 @@ var ( enableForClusterProfile(SelfManaged, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade, configv1.Default). mustRegister() + FeatureGateNewOLMCatalogdMetas = newFeatureGate("NewOLMCatalogdMetas"). + reportProblemsToJiraComponent("olm"). + contactPerson("jordank"). + productScope(ocpSpecific). + enhancementPR("https://github.com/openshift/enhancements/pull/1749"). + enableForClusterProfile(Hypershift, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade). + mustRegister() + FeatureGateInsightsOnDemandDataGather = newFeatureGate("InsightsOnDemandDataGather"). reportProblemsToJiraComponent("insights"). contactPerson("tremes"). diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml index e426c5e2296..02e729a7771 100644 --- a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml +++ b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml @@ -118,6 +118,9 @@ { "name": "NewOLM" }, + { + "name": "NewOLMCatalogdMetas" + }, { "name": "NodeSwap" }, diff --git a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml index c1bfbbab1ed..952fa3d457b 100644 --- a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml +++ b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml @@ -188,6 +188,9 @@ { "name": "NetworkSegmentation" }, + { + "name": "NewOLMCatalogdMetas" + }, { "name": "NodeDisruptionPolicy" }, diff --git a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml index 71503f817c5..98a5e4f6531 100644 --- a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml +++ b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml @@ -188,6 +188,9 @@ { "name": "NetworkSegmentation" }, + { + "name": "NewOLMCatalogdMetas" + }, { "name": "NodeDisruptionPolicy" }, diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml index 804606df4fb..3bfaa5a9ee6 100644 --- a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml +++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml @@ -118,6 +118,9 @@ { "name": "MultiArchInstallAzure" }, + { + "name": "NewOLMCatalogdMetas" + }, { "name": "NodeSwap" }, diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml index 78ea96d1e70..0e241ecaf3c 100644 --- a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml +++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml @@ -32,6 +32,9 @@ }, { "name": "MultiArchInstallAzure" + }, + { + "name": "NewOLMCatalogdMetas" } ], "enabled": [ diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml index ee741f2c35b..5e1099974f6 100644 --- a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml +++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml @@ -38,6 +38,9 @@ }, { "name": "MultiArchInstallAzure" + }, + { + "name": "NewOLMCatalogdMetas" } ], "enabled": [ From cedb0852cf4d883f2fdb4ddc9f365cae3211ef59 Mon Sep 17 00:00:00 2001 From: Jordan Keister Date: Mon, 17 Feb 2025 16:18:05 -0600 Subject: [PATCH 2/2] review resolution Signed-off-by: Jordan Keister --- features.md | 2 +- features/features.go | 4 ++-- .../featuregates/featureGate-Hypershift-Default.yaml | 2 +- .../featureGate-Hypershift-DevPreviewNoUpgrade.yaml | 6 +++--- .../featureGate-Hypershift-TechPreviewNoUpgrade.yaml | 6 +++--- .../featuregates/featureGate-SelfManagedHA-Default.yaml | 2 +- .../featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml | 6 +++--- .../featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml | 6 +++--- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/features.md b/features.md index 6c074809311..ad88757a2e5 100644 --- a/features.md +++ b/features.md @@ -8,7 +8,7 @@ | MultiArchInstallAzure| | | | | | | | ClusterVersionOperatorConfiguration| | | Enabled | Enabled | | | | Example2| | | Enabled | Enabled | | | -| NewOLMCatalogdMetas| | | Enabled | | Enabled | | +| NewOLMCatalogdAPIV1Metas| | | | Enabled | | Enabled | | NewOLM| | Enabled | | Enabled | | Enabled | | AWSClusterHostedDNS| | | Enabled | Enabled | Enabled | Enabled | | AutomatedEtcdBackup| | | Enabled | Enabled | Enabled | Enabled | diff --git a/features/features.go b/features/features.go index 71346aa42fb..9b4e0620be8 100644 --- a/features/features.go +++ b/features/features.go @@ -522,12 +522,12 @@ var ( enableForClusterProfile(SelfManaged, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade, configv1.Default). mustRegister() - FeatureGateNewOLMCatalogdMetas = newFeatureGate("NewOLMCatalogdMetas"). + FeatureGateNewOLMCatalogdMetas = newFeatureGate("NewOLMCatalogdAPIV1Metas"). reportProblemsToJiraComponent("olm"). contactPerson("jordank"). productScope(ocpSpecific). enhancementPR("https://github.com/openshift/enhancements/pull/1749"). - enableForClusterProfile(Hypershift, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade). + enableForClusterProfile(SelfManaged, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade). mustRegister() FeatureGateInsightsOnDemandDataGather = newFeatureGate("InsightsOnDemandDataGather"). diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml index 02e729a7771..ece9f68f41d 100644 --- a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml +++ b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml @@ -119,7 +119,7 @@ "name": "NewOLM" }, { - "name": "NewOLMCatalogdMetas" + "name": "NewOLMCatalogdAPIV1Metas" }, { "name": "NodeSwap" diff --git a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml index 952fa3d457b..713f53b683f 100644 --- a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml +++ b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml @@ -35,6 +35,9 @@ }, { "name": "NewOLM" + }, + { + "name": "NewOLMCatalogdAPIV1Metas" } ], "enabled": [ @@ -188,9 +191,6 @@ { "name": "NetworkSegmentation" }, - { - "name": "NewOLMCatalogdMetas" - }, { "name": "NodeDisruptionPolicy" }, diff --git a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml index 98a5e4f6531..6a5baa392c1 100644 --- a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml +++ b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml @@ -41,6 +41,9 @@ }, { "name": "NewOLM" + }, + { + "name": "NewOLMCatalogdAPIV1Metas" } ], "enabled": [ @@ -188,9 +191,6 @@ { "name": "NetworkSegmentation" }, - { - "name": "NewOLMCatalogdMetas" - }, { "name": "NodeDisruptionPolicy" }, diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml index 3bfaa5a9ee6..4c2ce84b673 100644 --- a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml +++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml @@ -119,7 +119,7 @@ "name": "MultiArchInstallAzure" }, { - "name": "NewOLMCatalogdMetas" + "name": "NewOLMCatalogdAPIV1Metas" }, { "name": "NodeSwap" diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml index 0e241ecaf3c..59cf8d23e02 100644 --- a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml +++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml @@ -32,9 +32,6 @@ }, { "name": "MultiArchInstallAzure" - }, - { - "name": "NewOLMCatalogdMetas" } ], "enabled": [ @@ -191,6 +188,9 @@ { "name": "NewOLM" }, + { + "name": "NewOLMCatalogdAPIV1Metas" + }, { "name": "NodeDisruptionPolicy" }, diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml index 5e1099974f6..7e25d567f5f 100644 --- a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml +++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml @@ -38,9 +38,6 @@ }, { "name": "MultiArchInstallAzure" - }, - { - "name": "NewOLMCatalogdMetas" } ], "enabled": [ @@ -191,6 +188,9 @@ { "name": "NewOLM" }, + { + "name": "NewOLMCatalogdAPIV1Metas" + }, { "name": "NodeDisruptionPolicy" },