intermediate: final changes

openshift · Mar 12, 2024 · 8093b1a · 8093b1a
1 parent ada39aa
commit 8093b1a
Show file tree

Hide file tree

Showing 15 changed files with 241 additions and 1,140 deletions.
diff --git a/config/v1/0000_03_marketplace-operator_01_operatorhub.crd.yaml b/config/v1/0000_03_marketplace-operator_01_operatorhub.crd.yaml
@@ -3,6 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     api-approved.openshift.io: https://github.com/openshift/api/pull/470
+    api.openshift.io/merged-by-featuregates: "true"
     capability.openshift.io/name: marketplace
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"

diff --git a/config/v1/0000_10_config-operator_01_network-CustomNoUpgrade.crd.yaml b/config/v1/0000_10_config-operator_01_network-CustomNoUpgrade.crd.yaml