Merge branch 'master' into efoley-zuul-local_build-index_deploy

infrawatch · Nov 23, 2023 · b2fbf8f · b2fbf8f
2 parents d315b5b + 6ec92f3
commit b2fbf8f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 50 deletions.
diff --git a/build/stf-run-ci/tasks/setup_base.yml b/build/stf-run-ci/tasks/setup_base.yml
@@ -28,47 +28,7 @@
         targetNamespaces:
         - "{{ namespace }}"
 
-# deploy cert-manager from tech-preview when using versions of OCP < 4.12
-- when: not __deploy_from_index_enabled | bool and ocp_ver.stdout is version ('4.12', '<')
-  block:
-    - name: Create openshift-cert-manager-operator namespace
-      kubernetes.core.k8s:
-        definition:
-          apiVersion: project.openshift.io/v1
-          kind: Project
-          metadata:
-            name: openshift-cert-manager-operator
-          spec:
-            finalizers:
-            - kubernetes
-
-    - name: Create openshift-cert-manager-operator OperatorGroup
-      kubernetes.core.k8s:
-        definition:
-          apiVersion: operators.coreos.com/v1
-          kind: OperatorGroup
-          metadata:
-            name: openshift-cert-manager-operator
-            namespace: openshift-cert-manager-operator
-          spec: {}
-
-    - name: Subscribe to Cert Manager for OpenShift Operator
-      kubernetes.core.k8s:
-        definition:
-          apiVersion: operators.coreos.com/v1alpha1
-          kind: Subscription
-          metadata:
-            name: openshift-cert-manager-operator
-            namespace: openshift-cert-manager-operator
-          spec:
-            channel: "tech-preview"
-            installPlanApproval: Automatic
-            name: openshift-cert-manager-operator
-            source: redhat-operators
-            sourceNamespace: openshift-marketplace
-
-# deploy cert-manager from stable-v1 in 4.12 and later using namespace scoped operator
-- when: not __deploy_from_index_enabled | bool and ocp_ver.stdout is version ('4.12', '>=')
+- when: not __deploy_from_index_enabled | bool
   block:
     - name: Subscribe to Cert Manager for OpenShift Operator
       kubernetes.core.k8s:
@@ -87,8 +47,6 @@
             source: redhat-operators
             sourceNamespace: openshift-marketplace
 
-- when: not __deploy_from_index_enabled | bool
-  block:
     - name: Subscribe to AMQ Interconnect Operator
       kubernetes.core.k8s:
         definition:
@@ -129,13 +87,13 @@
       metadata:
         labels:
           operators.coreos.com/observability-operator.openshift-operators: ""
-        name: observability-operator
+        name: cluster-observability-operator
         namespace: openshift-operators
       spec:
-        channel: stable
+        channel: development
         installPlanApproval: Automatic
-        name: observability-operator
-        source: community-operators
+        name: cluster-observability-operator
+        source: redhat-operators
         sourceNamespace: openshift-marketplace
   when:
     - __service_telemetry_observability_strategy in ['use_redhat', 'use_hybrid']

diff --git a/deploy/olm-catalog/service-telemetry-operator/metadata/properties.yaml b/deploy/olm-catalog/service-telemetry-operator/metadata/properties.yaml
@@ -27,7 +27,7 @@ properties:
           - failureMessage: Package openshift-cert-manager-operator is needed for AMQ Interconnect setup
             package:
               packageName: openshift-cert-manager-operator
-              versionRange: '>=1.10.0'
+              versionRange: '>=1.7.0'
   - type: olm.constraint
     value:
       failureMessage: Require Prometheus backend for data storage of metrics for Service Telemetry Framework
@@ -38,7 +38,7 @@ properties:
               versionRange: '>=0.56.0'
           - package:
               packageName: observability-operator
-              versionRange: '>=0.0.1'
+              versionRange: '>=0.0.25'
           - package:
               packageName: cluster-observability-operator
-              versionRange: '>=0.0.1'
+              versionRange: '>=0.1.0'