Re-enable CRO operator, move VPA & CRO to stable bundle dir

openshift-eng · Oct 11, 2022 · 6f82d81 · 6f82d81
1 parent 9e1d8df
commit 6f82d81
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/images/clusterresourceoverride-operator.yml b/images/clusterresourceoverride-operator.yml
@@ -1,6 +1,3 @@
-# Disabling until upstream updates channels for 4.12
-# ...or updates bundle dir to stable/
-mode: disabled
 content:
   source:
     dockerfile: Dockerfile.rhel7
@@ -27,7 +24,7 @@ name: openshift/ose-clusterresourceoverride-rhel8-operator
 owners:
 - aos-node@redhat.com
 update-csv:
-  bundle-dir: '{MAJOR}.{MINOR}/'
+  bundle-dir: stable/
   manifests-dir: manifests/
   registry: image-registry.openshift-image-registry.svc:5000
   valid-subscription-label: '["OpenShift Kubernetes Engine", "OpenShift Container Platform", "OpenShift Platform Plus"]'
diff --git a/images/clusterresourceoverride.yml b/images/clusterresourceoverride.yml
@@ -10,8 +10,8 @@ content:
       streams_prs:
         ci_build_root:
           stream: rhel-8-golang-ci-build-root
-# dependents:
-# - clusterresourceoverride-operator # Disabled to wait for updated bundle dirs
+dependents:
+- clusterresourceoverride-operator
 distgit:
   component: ose-clusterresourceoverride-container
 enabled_repos:

diff --git a/images/vertical-pod-autoscaler-operator.yml b/images/vertical-pod-autoscaler-operator.yml
@@ -24,7 +24,7 @@ name: openshift/ose-vertical-pod-autoscaler-rhel8-operator
 owners:
 - joesmith@redhat.com
 update-csv:
-  bundle-dir: '{MAJOR}.{MINOR}/'
+  bundle-dir: stable/
   manifests-dir: manifests/
   registry: image-registry.openshift-image-registry.svc:5000
   valid-subscription-label: '["OpenShift Kubernetes Engine", "OpenShift Container Platform", "OpenShift Platform Plus"]'