Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean up stf-run-ci for OCP 4.12 minimum version #539

Merged
merged 1 commit into from
Nov 21, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 5 additions & 47 deletions build/stf-run-ci/tasks/setup_base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down Expand Up @@ -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
csibbitt marked this conversation as resolved.
Show resolved Hide resolved
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']
Expand Down