From fe9e89f23b45e6faabcf7f3d782867a021ba6c97 Mon Sep 17 00:00:00 2001 From: Sofer Athlan-Guyot Date: Mon, 20 Jan 2025 15:33:46 +0100 Subject: [PATCH 1/8] [DNM] Deploy a specific old version. Just for testing purpose. --- lib/olm-openstack/barbican-subscription.yaml | 13 ++++++++++++ lib/olm-openstack/catalogsource.yaml | 4 +++- lib/olm-openstack/cinder-subscription.yaml | 13 ++++++++++++ lib/olm-openstack/designate-subscription.yaml | 13 ++++++++++++ lib/olm-openstack/glance-subscription.yaml | 13 ++++++++++++ lib/olm-openstack/heat-subscription.yaml | 13 ++++++++++++ lib/olm-openstack/horizon-subscription.yaml | 13 ++++++++++++ lib/olm-openstack/infra-subscription.yaml | 13 ++++++++++++ lib/olm-openstack/ironic-subscription.yaml | 13 ++++++++++++ lib/olm-openstack/keystone-subscription.yaml | 13 ++++++++++++ lib/olm-openstack/kustomization.yaml | 21 +++++++++++++++++++ lib/olm-openstack/manila-subscription.yaml | 13 ++++++++++++ lib/olm-openstack/mariadb-subscription.yaml | 13 ++++++++++++ lib/olm-openstack/neutron-subscription.yaml | 13 ++++++++++++ lib/olm-openstack/nova-subscription.yaml | 13 ++++++++++++ lib/olm-openstack/octavia-subscription.yaml | 13 ++++++++++++ .../openstack-ansibleee-subscription.yaml | 13 ++++++++++++ .../openstack-baremetal-subscription.yaml | 13 ++++++++++++ lib/olm-openstack/ovn-subscription.yaml | 13 ++++++++++++ lib/olm-openstack/placement-subscription.yaml | 13 ++++++++++++ .../rabbitmq-cluster-subscription.yaml | 13 ++++++++++++ lib/olm-openstack/subscription.yaml | 10 +++++---- lib/olm-openstack/swift-subscription.yaml | 13 ++++++++++++ lib/olm-openstack/telemetry-subscription.yaml | 13 ++++++++++++ 24 files changed, 303 insertions(+), 5 deletions(-) create mode 100644 lib/olm-openstack/barbican-subscription.yaml create mode 100644 lib/olm-openstack/cinder-subscription.yaml create mode 100644 lib/olm-openstack/designate-subscription.yaml create mode 100644 lib/olm-openstack/glance-subscription.yaml create mode 100644 lib/olm-openstack/heat-subscription.yaml create mode 100644 lib/olm-openstack/horizon-subscription.yaml create mode 100644 lib/olm-openstack/infra-subscription.yaml create mode 100644 lib/olm-openstack/ironic-subscription.yaml create mode 100644 lib/olm-openstack/keystone-subscription.yaml create mode 100644 lib/olm-openstack/manila-subscription.yaml create mode 100644 lib/olm-openstack/mariadb-subscription.yaml create mode 100644 lib/olm-openstack/neutron-subscription.yaml create mode 100644 lib/olm-openstack/nova-subscription.yaml create mode 100644 lib/olm-openstack/octavia-subscription.yaml create mode 100644 lib/olm-openstack/openstack-ansibleee-subscription.yaml create mode 100644 lib/olm-openstack/openstack-baremetal-subscription.yaml create mode 100644 lib/olm-openstack/ovn-subscription.yaml create mode 100644 lib/olm-openstack/placement-subscription.yaml create mode 100644 lib/olm-openstack/rabbitmq-cluster-subscription.yaml create mode 100644 lib/olm-openstack/swift-subscription.yaml create mode 100644 lib/olm-openstack/telemetry-subscription.yaml diff --git a/lib/olm-openstack/barbican-subscription.yaml b/lib/olm-openstack/barbican-subscription.yaml new file mode 100644 index 000000000..bd0c0b597 --- /dev/null +++ b/lib/olm-openstack/barbican-subscription.yaml @@ -0,0 +1,13 @@ +--- +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + name: barbican + namespace: openstack-operators +spec: + channel: stable-v1.0 + installPlanApproval: Manual + name: barbican-operator + source: rhoso-testing-operator-catalog + sourceNamespace: openshift-marketplace + startingCSV: barbican-operator.v1.0.3 diff --git a/lib/olm-openstack/catalogsource.yaml b/lib/olm-openstack/catalogsource.yaml index 6103236c8..dd7721eea 100644 --- a/lib/olm-openstack/catalogsource.yaml +++ b/lib/olm-openstack/catalogsource.yaml @@ -2,8 +2,10 @@ apiVersion: operators.coreos.com/v1alpha1 kind: CatalogSource metadata: - name: openstack-operator-index + name: rhoso-testing-operator-catalog namespace: openstack-operators spec: image: quay.io/openstack-k8s-operators/openstack-operator-index:latest sourceType: grpc + displayName: RHOSO Operator Test Catalog + publisher: grpc diff --git a/lib/olm-openstack/cinder-subscription.yaml b/lib/olm-openstack/cinder-subscription.yaml new file mode 100644 index 000000000..5a3228ea5 --- /dev/null +++ b/lib/olm-openstack/cinder-subscription.yaml @@ -0,0 +1,13 @@ +--- +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + name: cinder + namespace: openstack-operators +spec: + channel: stable-v1.0 + installPlanApproval: Manual + name: cinder-operator + source: rhoso-testing-operator-catalog + sourceNamespace: openshift-marketplace + startingCSV: cinder-operator.v1.0.3 diff --git a/lib/olm-openstack/designate-subscription.yaml b/lib/olm-openstack/designate-subscription.yaml new file mode 100644 index 000000000..e5a640afd --- /dev/null +++ b/lib/olm-openstack/designate-subscription.yaml @@ -0,0 +1,13 @@ +--- +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + name: designate + namespace: openstack-operators +spec: + channel: stable-v1.0 + installPlanApproval: Manual + name: designate-operator + source: rhoso-testing-operator-catalog + sourceNamespace: openshift-marketplace + startingCSV: designate-operator.v1.0.3 diff --git a/lib/olm-openstack/glance-subscription.yaml b/lib/olm-openstack/glance-subscription.yaml new file mode 100644 index 000000000..e5c996d33 --- /dev/null +++ b/lib/olm-openstack/glance-subscription.yaml @@ -0,0 +1,13 @@ +--- +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + name: glance + namespace: openstack-operators +spec: + channel: stable-v1.0 + installPlanApproval: Manual + name: glance-operator + source: rhoso-testing-operator-catalog + sourceNamespace: openshift-marketplace + startingCSV: glance-operator.v1.0.3 diff --git a/lib/olm-openstack/heat-subscription.yaml b/lib/olm-openstack/heat-subscription.yaml new file mode 100644 index 000000000..13b840d8b --- /dev/null +++ b/lib/olm-openstack/heat-subscription.yaml @@ -0,0 +1,13 @@ +--- +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + name: heat + namespace: openstack-operators +spec: + channel: stable-v1.0 + installPlanApproval: Manual + name: heat-operator + source: rhoso-testing-operator-catalog + sourceNamespace: openshift-marketplace + startingCSV: heat-operator.v1.0.3 diff --git a/lib/olm-openstack/horizon-subscription.yaml b/lib/olm-openstack/horizon-subscription.yaml new file mode 100644 index 000000000..27885db40 --- /dev/null +++ b/lib/olm-openstack/horizon-subscription.yaml @@ -0,0 +1,13 @@ +--- +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + name: horizon + namespace: openstack-operators +spec: + channel: stable-v1.0 + installPlanApproval: Manual + name: horizon-operator + source: rhoso-testing-operator-catalog + sourceNamespace: openshift-marketplace + startingCSV: horizon-operator.v1.0.3 diff --git a/lib/olm-openstack/infra-subscription.yaml b/lib/olm-openstack/infra-subscription.yaml new file mode 100644 index 000000000..75618526b --- /dev/null +++ b/lib/olm-openstack/infra-subscription.yaml @@ -0,0 +1,13 @@ +--- +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + name: infra + namespace: openstack-operators +spec: + channel: stable-v1.0 + installPlanApproval: Manual + name: infra-operator + source: rhoso-testing-operator-catalog + sourceNamespace: openshift-marketplace + startingCSV: infra-operator.v1.0.3 diff --git a/lib/olm-openstack/ironic-subscription.yaml b/lib/olm-openstack/ironic-subscription.yaml new file mode 100644 index 000000000..461c85778 --- /dev/null +++ b/lib/olm-openstack/ironic-subscription.yaml @@ -0,0 +1,13 @@ +--- +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + name: ironic + namespace: openstack-operators +spec: + channel: stable-v1.0 + installPlanApproval: Manual + name: ironic-operator + source: rhoso-testing-operator-catalog + sourceNamespace: openshift-marketplace + startingCSV: ironic-operator.v1.0.3 diff --git a/lib/olm-openstack/keystone-subscription.yaml b/lib/olm-openstack/keystone-subscription.yaml new file mode 100644 index 000000000..0c9c56ab2 --- /dev/null +++ b/lib/olm-openstack/keystone-subscription.yaml @@ -0,0 +1,13 @@ +--- +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + name: keystone + namespace: openstack-operators +spec: + channel: stable-v1.0 + installPlanApproval: Manual + name: keystone-operator + source: rhoso-testing-operator-catalog + sourceNamespace: openshift-marketplace + startingCSV: keystone-operator.v1.0.3 diff --git a/lib/olm-openstack/kustomization.yaml b/lib/olm-openstack/kustomization.yaml index 12c0e4b20..54313d1ff 100644 --- a/lib/olm-openstack/kustomization.yaml +++ b/lib/olm-openstack/kustomization.yaml @@ -7,6 +7,27 @@ resources: - namespaces.yaml - operatorgroup.yaml - subscription.yaml + - barbican-subscription.yaml + - cinder-subscription.yaml + - designate-subscription.yaml + - glance-subscription.yaml + - heat-subscription.yaml + - horizon-subscription.yaml + - infra-subscription.yaml + - ironic-subscription.yaml + - keystone-subscription.yaml + - manila-subscription.yaml + - mariadb-subscription.yaml + - neutron-subscription.yaml + - nova-subscription.yaml + - octavia-subscription.yaml + - openstack-ansibleee-subscription.yaml + - openstack-baremetal-subscription.yaml + - ovn-subscription.yaml + - placement-subscription.yaml + - rabbitmq-cluster-subscription.yaml + - swift-subscription.yaml + - telemetry-subscription.yaml replacements: - source: diff --git a/lib/olm-openstack/manila-subscription.yaml b/lib/olm-openstack/manila-subscription.yaml new file mode 100644 index 000000000..8bda9e436 --- /dev/null +++ b/lib/olm-openstack/manila-subscription.yaml @@ -0,0 +1,13 @@ +--- +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + name: manila + namespace: openstack-operators +spec: + channel: stable-v1.0 + installPlanApproval: Manual + name: manila-operator + source: rhoso-testing-operator-catalog + sourceNamespace: openshift-marketplace + startingCSV: manila-operator.v1.0.3 diff --git a/lib/olm-openstack/mariadb-subscription.yaml b/lib/olm-openstack/mariadb-subscription.yaml new file mode 100644 index 000000000..63d4a085c --- /dev/null +++ b/lib/olm-openstack/mariadb-subscription.yaml @@ -0,0 +1,13 @@ +--- +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + name: mariadb + namespace: openstack-operators +spec: + channel: stable-v1.0 + installPlanApproval: Manual + name: mariadb-operator + source: rhoso-testing-operator-catalog + sourceNamespace: openshift-marketplace + startingCSV: mariadb-operator.v1.0.3 diff --git a/lib/olm-openstack/neutron-subscription.yaml b/lib/olm-openstack/neutron-subscription.yaml new file mode 100644 index 000000000..9de69102c --- /dev/null +++ b/lib/olm-openstack/neutron-subscription.yaml @@ -0,0 +1,13 @@ +--- +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + name: neutron + namespace: openstack-operators +spec: + channel: stable-v1.0 + installPlanApproval: Manual + name: neutron-operator + source: rhoso-testing-operator-catalog + sourceNamespace: openshift-marketplace + startingCSV: neutron-operator.v1.0.3 diff --git a/lib/olm-openstack/nova-subscription.yaml b/lib/olm-openstack/nova-subscription.yaml new file mode 100644 index 000000000..1a5010a5a --- /dev/null +++ b/lib/olm-openstack/nova-subscription.yaml @@ -0,0 +1,13 @@ +--- +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + name: nova + namespace: openstack-operators +spec: + channel: stable-v1.0 + installPlanApproval: Manual + name: nova-operator + source: rhoso-testing-operator-catalog + sourceNamespace: openshift-marketplace + startingCSV: nova-operator.v1.0.3 diff --git a/lib/olm-openstack/octavia-subscription.yaml b/lib/olm-openstack/octavia-subscription.yaml new file mode 100644 index 000000000..774794a11 --- /dev/null +++ b/lib/olm-openstack/octavia-subscription.yaml @@ -0,0 +1,13 @@ +--- +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + name: octavia + namespace: openstack-operators +spec: + channel: stable-v1.0 + installPlanApproval: Manual + name: octavia-operator + source: rhoso-testing-operator-catalog + sourceNamespace: openshift-marketplace + startingCSV: octavia-operator.v1.0.3 diff --git a/lib/olm-openstack/openstack-ansibleee-subscription.yaml b/lib/olm-openstack/openstack-ansibleee-subscription.yaml new file mode 100644 index 000000000..eeba2759d --- /dev/null +++ b/lib/olm-openstack/openstack-ansibleee-subscription.yaml @@ -0,0 +1,13 @@ +--- +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + name: openstack-ansibleee + namespace: openstack-operators +spec: + channel: stable-v1.0 + installPlanApproval: Manual + name: openstack-ansibleee-operator + source: rhoso-testing-operator-catalog + sourceNamespace: openshift-marketplace + startingCSV: openstack-ansibleee-operator.v1.0.3 diff --git a/lib/olm-openstack/openstack-baremetal-subscription.yaml b/lib/olm-openstack/openstack-baremetal-subscription.yaml new file mode 100644 index 000000000..d3bb709ca --- /dev/null +++ b/lib/olm-openstack/openstack-baremetal-subscription.yaml @@ -0,0 +1,13 @@ +--- +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + name: openstack-baremetal + namespace: openstack-operators +spec: + channel: stable-v1.0 + installPlanApproval: Manual + name: openstack-baremetal-operator + source: rhoso-testing-operator-catalog + sourceNamespace: openshift-marketplace + startingCSV: openstack-baremetal-operator.v1.0.3 diff --git a/lib/olm-openstack/ovn-subscription.yaml b/lib/olm-openstack/ovn-subscription.yaml new file mode 100644 index 000000000..52d0cca2b --- /dev/null +++ b/lib/olm-openstack/ovn-subscription.yaml @@ -0,0 +1,13 @@ +--- +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + name: ovn + namespace: openstack-operators +spec: + channel: stable-v1.0 + installPlanApproval: Manual + name: ovn-operator + source: rhoso-testing-operator-catalog + sourceNamespace: openshift-marketplace + startingCSV: ovn-operator.v1.0.3 diff --git a/lib/olm-openstack/placement-subscription.yaml b/lib/olm-openstack/placement-subscription.yaml new file mode 100644 index 000000000..afaa466e0 --- /dev/null +++ b/lib/olm-openstack/placement-subscription.yaml @@ -0,0 +1,13 @@ +--- +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + name: placement + namespace: openstack-operators +spec: + channel: stable-v1.0 + installPlanApproval: Manual + name: placement-operator + source: rhoso-testing-operator-catalog + sourceNamespace: openshift-marketplace + startingCSV: placement-operator.v1.0.3 diff --git a/lib/olm-openstack/rabbitmq-cluster-subscription.yaml b/lib/olm-openstack/rabbitmq-cluster-subscription.yaml new file mode 100644 index 000000000..67b38f44d --- /dev/null +++ b/lib/olm-openstack/rabbitmq-cluster-subscription.yaml @@ -0,0 +1,13 @@ +--- +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + name: rabbitmq-cluster + namespace: openstack-operators +spec: + channel: stable-v1.0 + installPlanApproval: Manual + name: rabbitmq-cluster-operator + source: rhoso-testing-operator-catalog + sourceNamespace: openshift-marketplace + startingCSV: rabbitmq-cluster-operator.v1.0.3 diff --git a/lib/olm-openstack/subscription.yaml b/lib/olm-openstack/subscription.yaml index e2795e5e0..4c7fb6547 100644 --- a/lib/olm-openstack/subscription.yaml +++ b/lib/olm-openstack/subscription.yaml @@ -2,10 +2,12 @@ apiVersion: operators.coreos.com/v1alpha1 kind: Subscription metadata: - name: openstack-operator + name: openstack namespace: openstack-operators spec: + channel: stable-v1.0 + installPlanApproval: Manual name: openstack-operator - channel: alpha - source: openstack-operator-index - sourceNamespace: openstack-operators + source: rhoso-testing-operator-catalog + sourceNamespace: openshift-marketplace + startingCSV: openstack-operator.v1.0.3 diff --git a/lib/olm-openstack/swift-subscription.yaml b/lib/olm-openstack/swift-subscription.yaml new file mode 100644 index 000000000..f19f5976d --- /dev/null +++ b/lib/olm-openstack/swift-subscription.yaml @@ -0,0 +1,13 @@ +--- +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + name: swift + namespace: openstack-operators +spec: + channel: stable-v1.0 + installPlanApproval: Manual + name: swift-operator + source: rhoso-testing-operator-catalog + sourceNamespace: openshift-marketplace + startingCSV: swift-operator.v1.0.3 diff --git a/lib/olm-openstack/telemetry-subscription.yaml b/lib/olm-openstack/telemetry-subscription.yaml new file mode 100644 index 000000000..84ed913a0 --- /dev/null +++ b/lib/olm-openstack/telemetry-subscription.yaml @@ -0,0 +1,13 @@ +--- +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + name: telemetry + namespace: openstack-operators +spec: + channel: stable-v1.0 + installPlanApproval: Manual + name: telemetry-operator + source: rhoso-testing-operator-catalog + sourceNamespace: openshift-marketplace + startingCSV: telemetry-operator.v1.0.3 From a5014216dabdd2a091e19485e3be2cd7c0893d90 Mon Sep 17 00:00:00 2001 From: Sofer Athlan-Guyot Date: Thu, 23 Jan 2025 05:42:17 +0100 Subject: [PATCH 2/8] Switch to 1.0.5 and fix a typo. --- lib/olm-openstack/barbican-subscription.yaml | 2 +- lib/olm-openstack/catalogsource.yaml | 6 +++--- lib/olm-openstack/cinder-subscription.yaml | 2 +- lib/olm-openstack/designate-subscription.yaml | 2 +- lib/olm-openstack/glance-subscription.yaml | 2 +- lib/olm-openstack/heat-subscription.yaml | 2 +- lib/olm-openstack/horizon-subscription.yaml | 2 +- lib/olm-openstack/infra-subscription.yaml | 2 +- lib/olm-openstack/ironic-subscription.yaml | 2 +- lib/olm-openstack/keystone-subscription.yaml | 2 +- lib/olm-openstack/manila-subscription.yaml | 2 +- lib/olm-openstack/mariadb-subscription.yaml | 2 +- lib/olm-openstack/neutron-subscription.yaml | 2 +- lib/olm-openstack/nova-subscription.yaml | 2 +- lib/olm-openstack/octavia-subscription.yaml | 2 +- .../openstack-ansibleee-subscription.yaml | 13 ------------- .../openstack-baremetal-subscription.yaml | 2 +- lib/olm-openstack/ovn-subscription.yaml | 2 +- lib/olm-openstack/placement-subscription.yaml | 2 +- .../rabbitmq-cluster-subscription.yaml | 2 +- lib/olm-openstack/subscription.yaml | 2 +- lib/olm-openstack/swift-subscription.yaml | 2 +- lib/olm-openstack/telemetry-subscription.yaml | 2 +- 23 files changed, 24 insertions(+), 37 deletions(-) delete mode 100644 lib/olm-openstack/openstack-ansibleee-subscription.yaml diff --git a/lib/olm-openstack/barbican-subscription.yaml b/lib/olm-openstack/barbican-subscription.yaml index bd0c0b597..1684025c4 100644 --- a/lib/olm-openstack/barbican-subscription.yaml +++ b/lib/olm-openstack/barbican-subscription.yaml @@ -10,4 +10,4 @@ spec: name: barbican-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: barbican-operator.v1.0.3 + startingCSV: barbican-operator.v1.0.5 diff --git a/lib/olm-openstack/catalogsource.yaml b/lib/olm-openstack/catalogsource.yaml index dd7721eea..27f3a2461 100644 --- a/lib/olm-openstack/catalogsource.yaml +++ b/lib/olm-openstack/catalogsource.yaml @@ -3,9 +3,9 @@ apiVersion: operators.coreos.com/v1alpha1 kind: CatalogSource metadata: name: rhoso-testing-operator-catalog - namespace: openstack-operators + namespace: openshift-marketplace spec: - image: quay.io/openstack-k8s-operators/openstack-operator-index:latest + image: brew.registry.redhat.io/rh-osbs/iib:892408 sourceType: grpc displayName: RHOSO Operator Test Catalog - publisher: grpc + publisher: RHOS Delivery diff --git a/lib/olm-openstack/cinder-subscription.yaml b/lib/olm-openstack/cinder-subscription.yaml index 5a3228ea5..a0f2b1ef2 100644 --- a/lib/olm-openstack/cinder-subscription.yaml +++ b/lib/olm-openstack/cinder-subscription.yaml @@ -10,4 +10,4 @@ spec: name: cinder-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: cinder-operator.v1.0.3 + startingCSV: cinder-operator.v1.0.5 diff --git a/lib/olm-openstack/designate-subscription.yaml b/lib/olm-openstack/designate-subscription.yaml index e5a640afd..4aba827f7 100644 --- a/lib/olm-openstack/designate-subscription.yaml +++ b/lib/olm-openstack/designate-subscription.yaml @@ -10,4 +10,4 @@ spec: name: designate-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: designate-operator.v1.0.3 + startingCSV: designate-operator.v1.0.5 diff --git a/lib/olm-openstack/glance-subscription.yaml b/lib/olm-openstack/glance-subscription.yaml index e5c996d33..8c1d26d62 100644 --- a/lib/olm-openstack/glance-subscription.yaml +++ b/lib/olm-openstack/glance-subscription.yaml @@ -10,4 +10,4 @@ spec: name: glance-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: glance-operator.v1.0.3 + startingCSV: glance-operator.v1.0.5 diff --git a/lib/olm-openstack/heat-subscription.yaml b/lib/olm-openstack/heat-subscription.yaml index 13b840d8b..3ad200fae 100644 --- a/lib/olm-openstack/heat-subscription.yaml +++ b/lib/olm-openstack/heat-subscription.yaml @@ -10,4 +10,4 @@ spec: name: heat-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: heat-operator.v1.0.3 + startingCSV: heat-operator.v1.0.5 diff --git a/lib/olm-openstack/horizon-subscription.yaml b/lib/olm-openstack/horizon-subscription.yaml index 27885db40..b6e2135f1 100644 --- a/lib/olm-openstack/horizon-subscription.yaml +++ b/lib/olm-openstack/horizon-subscription.yaml @@ -10,4 +10,4 @@ spec: name: horizon-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: horizon-operator.v1.0.3 + startingCSV: horizon-operator.v1.0.5 diff --git a/lib/olm-openstack/infra-subscription.yaml b/lib/olm-openstack/infra-subscription.yaml index 75618526b..9d2f7ac12 100644 --- a/lib/olm-openstack/infra-subscription.yaml +++ b/lib/olm-openstack/infra-subscription.yaml @@ -10,4 +10,4 @@ spec: name: infra-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: infra-operator.v1.0.3 + startingCSV: infra-operator.v1.0.5 diff --git a/lib/olm-openstack/ironic-subscription.yaml b/lib/olm-openstack/ironic-subscription.yaml index 461c85778..cb9919102 100644 --- a/lib/olm-openstack/ironic-subscription.yaml +++ b/lib/olm-openstack/ironic-subscription.yaml @@ -10,4 +10,4 @@ spec: name: ironic-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: ironic-operator.v1.0.3 + startingCSV: ironic-operator.v1.0.5 diff --git a/lib/olm-openstack/keystone-subscription.yaml b/lib/olm-openstack/keystone-subscription.yaml index 0c9c56ab2..020ecc9dd 100644 --- a/lib/olm-openstack/keystone-subscription.yaml +++ b/lib/olm-openstack/keystone-subscription.yaml @@ -10,4 +10,4 @@ spec: name: keystone-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: keystone-operator.v1.0.3 + startingCSV: keystone-operator.v1.0.5 diff --git a/lib/olm-openstack/manila-subscription.yaml b/lib/olm-openstack/manila-subscription.yaml index 8bda9e436..ffdcfc570 100644 --- a/lib/olm-openstack/manila-subscription.yaml +++ b/lib/olm-openstack/manila-subscription.yaml @@ -10,4 +10,4 @@ spec: name: manila-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: manila-operator.v1.0.3 + startingCSV: manila-operator.v1.0.5 diff --git a/lib/olm-openstack/mariadb-subscription.yaml b/lib/olm-openstack/mariadb-subscription.yaml index 63d4a085c..21fff6041 100644 --- a/lib/olm-openstack/mariadb-subscription.yaml +++ b/lib/olm-openstack/mariadb-subscription.yaml @@ -10,4 +10,4 @@ spec: name: mariadb-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: mariadb-operator.v1.0.3 + startingCSV: mariadb-operator.v1.0.5 diff --git a/lib/olm-openstack/neutron-subscription.yaml b/lib/olm-openstack/neutron-subscription.yaml index 9de69102c..f613394c9 100644 --- a/lib/olm-openstack/neutron-subscription.yaml +++ b/lib/olm-openstack/neutron-subscription.yaml @@ -10,4 +10,4 @@ spec: name: neutron-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: neutron-operator.v1.0.3 + startingCSV: neutron-operator.v1.0.5 diff --git a/lib/olm-openstack/nova-subscription.yaml b/lib/olm-openstack/nova-subscription.yaml index 1a5010a5a..c3f49fef6 100644 --- a/lib/olm-openstack/nova-subscription.yaml +++ b/lib/olm-openstack/nova-subscription.yaml @@ -10,4 +10,4 @@ spec: name: nova-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: nova-operator.v1.0.3 + startingCSV: nova-operator.v1.0.5 diff --git a/lib/olm-openstack/octavia-subscription.yaml b/lib/olm-openstack/octavia-subscription.yaml index 774794a11..92e7171f9 100644 --- a/lib/olm-openstack/octavia-subscription.yaml +++ b/lib/olm-openstack/octavia-subscription.yaml @@ -10,4 +10,4 @@ spec: name: octavia-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: octavia-operator.v1.0.3 + startingCSV: octavia-operator.v1.0.5 diff --git a/lib/olm-openstack/openstack-ansibleee-subscription.yaml b/lib/olm-openstack/openstack-ansibleee-subscription.yaml deleted file mode 100644 index eeba2759d..000000000 --- a/lib/olm-openstack/openstack-ansibleee-subscription.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -apiVersion: operators.coreos.com/v1alpha1 -kind: Subscription -metadata: - name: openstack-ansibleee - namespace: openstack-operators -spec: - channel: stable-v1.0 - installPlanApproval: Manual - name: openstack-ansibleee-operator - source: rhoso-testing-operator-catalog - sourceNamespace: openshift-marketplace - startingCSV: openstack-ansibleee-operator.v1.0.3 diff --git a/lib/olm-openstack/openstack-baremetal-subscription.yaml b/lib/olm-openstack/openstack-baremetal-subscription.yaml index d3bb709ca..0516199a1 100644 --- a/lib/olm-openstack/openstack-baremetal-subscription.yaml +++ b/lib/olm-openstack/openstack-baremetal-subscription.yaml @@ -10,4 +10,4 @@ spec: name: openstack-baremetal-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: openstack-baremetal-operator.v1.0.3 + startingCSV: openstack-baremetal-operator.v1.0.5 diff --git a/lib/olm-openstack/ovn-subscription.yaml b/lib/olm-openstack/ovn-subscription.yaml index 52d0cca2b..3b20e02b6 100644 --- a/lib/olm-openstack/ovn-subscription.yaml +++ b/lib/olm-openstack/ovn-subscription.yaml @@ -10,4 +10,4 @@ spec: name: ovn-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: ovn-operator.v1.0.3 + startingCSV: ovn-operator.v1.0.5 diff --git a/lib/olm-openstack/placement-subscription.yaml b/lib/olm-openstack/placement-subscription.yaml index afaa466e0..8817d61c4 100644 --- a/lib/olm-openstack/placement-subscription.yaml +++ b/lib/olm-openstack/placement-subscription.yaml @@ -10,4 +10,4 @@ spec: name: placement-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: placement-operator.v1.0.3 + startingCSV: placement-operator.v1.0.5 diff --git a/lib/olm-openstack/rabbitmq-cluster-subscription.yaml b/lib/olm-openstack/rabbitmq-cluster-subscription.yaml index 67b38f44d..531ec61c2 100644 --- a/lib/olm-openstack/rabbitmq-cluster-subscription.yaml +++ b/lib/olm-openstack/rabbitmq-cluster-subscription.yaml @@ -10,4 +10,4 @@ spec: name: rabbitmq-cluster-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: rabbitmq-cluster-operator.v1.0.3 + startingCSV: rabbitmq-cluster-operator.v1.0.5 diff --git a/lib/olm-openstack/subscription.yaml b/lib/olm-openstack/subscription.yaml index 4c7fb6547..3e38c829b 100644 --- a/lib/olm-openstack/subscription.yaml +++ b/lib/olm-openstack/subscription.yaml @@ -10,4 +10,4 @@ spec: name: openstack-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: openstack-operator.v1.0.3 + startingCSV: openstack-operator.v1.0.5 diff --git a/lib/olm-openstack/swift-subscription.yaml b/lib/olm-openstack/swift-subscription.yaml index f19f5976d..782ca33e3 100644 --- a/lib/olm-openstack/swift-subscription.yaml +++ b/lib/olm-openstack/swift-subscription.yaml @@ -10,4 +10,4 @@ spec: name: swift-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: swift-operator.v1.0.3 + startingCSV: swift-operator.v1.0.5 diff --git a/lib/olm-openstack/telemetry-subscription.yaml b/lib/olm-openstack/telemetry-subscription.yaml index 84ed913a0..52863201d 100644 --- a/lib/olm-openstack/telemetry-subscription.yaml +++ b/lib/olm-openstack/telemetry-subscription.yaml @@ -10,4 +10,4 @@ spec: name: telemetry-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: telemetry-operator.v1.0.3 + startingCSV: telemetry-operator.v1.0.5 From 4e01f83588196ff4bdf15ab08b2509495d5df3ba Mon Sep 17 00:00:00 2001 From: Sofer Athlan-Guyot Date: Mon, 27 Jan 2025 15:47:40 +0100 Subject: [PATCH 3/8] Switch back to 1.0.3. 1.0.5 cannot be installed with non-trunk content. --- lib/olm-openstack/barbican-subscription.yaml | 2 +- lib/olm-openstack/cinder-subscription.yaml | 2 +- lib/olm-openstack/designate-subscription.yaml | 2 +- lib/olm-openstack/glance-subscription.yaml | 2 +- lib/olm-openstack/heat-subscription.yaml | 2 +- lib/olm-openstack/horizon-subscription.yaml | 2 +- lib/olm-openstack/infra-subscription.yaml | 2 +- lib/olm-openstack/ironic-subscription.yaml | 2 +- lib/olm-openstack/keystone-subscription.yaml | 2 +- lib/olm-openstack/kustomization.yaml | 1 - lib/olm-openstack/manila-subscription.yaml | 2 +- lib/olm-openstack/mariadb-subscription.yaml | 2 +- lib/olm-openstack/neutron-subscription.yaml | 2 +- lib/olm-openstack/nova-subscription.yaml | 2 +- lib/olm-openstack/octavia-subscription.yaml | 2 +- .../openstack-ansibleee-subscription.yaml | 13 +++++++++++++ .../openstack-baremetal-subscription.yaml | 2 +- lib/olm-openstack/ovn-subscription.yaml | 2 +- lib/olm-openstack/placement-subscription.yaml | 2 +- .../rabbitmq-cluster-subscription.yaml | 2 +- lib/olm-openstack/subscription.yaml | 2 +- lib/olm-openstack/swift-subscription.yaml | 2 +- lib/olm-openstack/telemetry-subscription.yaml | 2 +- 23 files changed, 34 insertions(+), 22 deletions(-) create mode 100644 lib/olm-openstack/openstack-ansibleee-subscription.yaml diff --git a/lib/olm-openstack/barbican-subscription.yaml b/lib/olm-openstack/barbican-subscription.yaml index 1684025c4..bd0c0b597 100644 --- a/lib/olm-openstack/barbican-subscription.yaml +++ b/lib/olm-openstack/barbican-subscription.yaml @@ -10,4 +10,4 @@ spec: name: barbican-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: barbican-operator.v1.0.5 + startingCSV: barbican-operator.v1.0.3 diff --git a/lib/olm-openstack/cinder-subscription.yaml b/lib/olm-openstack/cinder-subscription.yaml index a0f2b1ef2..5a3228ea5 100644 --- a/lib/olm-openstack/cinder-subscription.yaml +++ b/lib/olm-openstack/cinder-subscription.yaml @@ -10,4 +10,4 @@ spec: name: cinder-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: cinder-operator.v1.0.5 + startingCSV: cinder-operator.v1.0.3 diff --git a/lib/olm-openstack/designate-subscription.yaml b/lib/olm-openstack/designate-subscription.yaml index 4aba827f7..e5a640afd 100644 --- a/lib/olm-openstack/designate-subscription.yaml +++ b/lib/olm-openstack/designate-subscription.yaml @@ -10,4 +10,4 @@ spec: name: designate-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: designate-operator.v1.0.5 + startingCSV: designate-operator.v1.0.3 diff --git a/lib/olm-openstack/glance-subscription.yaml b/lib/olm-openstack/glance-subscription.yaml index 8c1d26d62..e5c996d33 100644 --- a/lib/olm-openstack/glance-subscription.yaml +++ b/lib/olm-openstack/glance-subscription.yaml @@ -10,4 +10,4 @@ spec: name: glance-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: glance-operator.v1.0.5 + startingCSV: glance-operator.v1.0.3 diff --git a/lib/olm-openstack/heat-subscription.yaml b/lib/olm-openstack/heat-subscription.yaml index 3ad200fae..13b840d8b 100644 --- a/lib/olm-openstack/heat-subscription.yaml +++ b/lib/olm-openstack/heat-subscription.yaml @@ -10,4 +10,4 @@ spec: name: heat-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: heat-operator.v1.0.5 + startingCSV: heat-operator.v1.0.3 diff --git a/lib/olm-openstack/horizon-subscription.yaml b/lib/olm-openstack/horizon-subscription.yaml index b6e2135f1..27885db40 100644 --- a/lib/olm-openstack/horizon-subscription.yaml +++ b/lib/olm-openstack/horizon-subscription.yaml @@ -10,4 +10,4 @@ spec: name: horizon-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: horizon-operator.v1.0.5 + startingCSV: horizon-operator.v1.0.3 diff --git a/lib/olm-openstack/infra-subscription.yaml b/lib/olm-openstack/infra-subscription.yaml index 9d2f7ac12..75618526b 100644 --- a/lib/olm-openstack/infra-subscription.yaml +++ b/lib/olm-openstack/infra-subscription.yaml @@ -10,4 +10,4 @@ spec: name: infra-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: infra-operator.v1.0.5 + startingCSV: infra-operator.v1.0.3 diff --git a/lib/olm-openstack/ironic-subscription.yaml b/lib/olm-openstack/ironic-subscription.yaml index cb9919102..461c85778 100644 --- a/lib/olm-openstack/ironic-subscription.yaml +++ b/lib/olm-openstack/ironic-subscription.yaml @@ -10,4 +10,4 @@ spec: name: ironic-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: ironic-operator.v1.0.5 + startingCSV: ironic-operator.v1.0.3 diff --git a/lib/olm-openstack/keystone-subscription.yaml b/lib/olm-openstack/keystone-subscription.yaml index 020ecc9dd..0c9c56ab2 100644 --- a/lib/olm-openstack/keystone-subscription.yaml +++ b/lib/olm-openstack/keystone-subscription.yaml @@ -10,4 +10,4 @@ spec: name: keystone-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: keystone-operator.v1.0.5 + startingCSV: keystone-operator.v1.0.3 diff --git a/lib/olm-openstack/kustomization.yaml b/lib/olm-openstack/kustomization.yaml index 54313d1ff..74cdfdcaa 100644 --- a/lib/olm-openstack/kustomization.yaml +++ b/lib/olm-openstack/kustomization.yaml @@ -21,7 +21,6 @@ resources: - neutron-subscription.yaml - nova-subscription.yaml - octavia-subscription.yaml - - openstack-ansibleee-subscription.yaml - openstack-baremetal-subscription.yaml - ovn-subscription.yaml - placement-subscription.yaml diff --git a/lib/olm-openstack/manila-subscription.yaml b/lib/olm-openstack/manila-subscription.yaml index ffdcfc570..8bda9e436 100644 --- a/lib/olm-openstack/manila-subscription.yaml +++ b/lib/olm-openstack/manila-subscription.yaml @@ -10,4 +10,4 @@ spec: name: manila-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: manila-operator.v1.0.5 + startingCSV: manila-operator.v1.0.3 diff --git a/lib/olm-openstack/mariadb-subscription.yaml b/lib/olm-openstack/mariadb-subscription.yaml index 21fff6041..63d4a085c 100644 --- a/lib/olm-openstack/mariadb-subscription.yaml +++ b/lib/olm-openstack/mariadb-subscription.yaml @@ -10,4 +10,4 @@ spec: name: mariadb-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: mariadb-operator.v1.0.5 + startingCSV: mariadb-operator.v1.0.3 diff --git a/lib/olm-openstack/neutron-subscription.yaml b/lib/olm-openstack/neutron-subscription.yaml index f613394c9..9de69102c 100644 --- a/lib/olm-openstack/neutron-subscription.yaml +++ b/lib/olm-openstack/neutron-subscription.yaml @@ -10,4 +10,4 @@ spec: name: neutron-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: neutron-operator.v1.0.5 + startingCSV: neutron-operator.v1.0.3 diff --git a/lib/olm-openstack/nova-subscription.yaml b/lib/olm-openstack/nova-subscription.yaml index c3f49fef6..1a5010a5a 100644 --- a/lib/olm-openstack/nova-subscription.yaml +++ b/lib/olm-openstack/nova-subscription.yaml @@ -10,4 +10,4 @@ spec: name: nova-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: nova-operator.v1.0.5 + startingCSV: nova-operator.v1.0.3 diff --git a/lib/olm-openstack/octavia-subscription.yaml b/lib/olm-openstack/octavia-subscription.yaml index 92e7171f9..774794a11 100644 --- a/lib/olm-openstack/octavia-subscription.yaml +++ b/lib/olm-openstack/octavia-subscription.yaml @@ -10,4 +10,4 @@ spec: name: octavia-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: octavia-operator.v1.0.5 + startingCSV: octavia-operator.v1.0.3 diff --git a/lib/olm-openstack/openstack-ansibleee-subscription.yaml b/lib/olm-openstack/openstack-ansibleee-subscription.yaml new file mode 100644 index 000000000..eeba2759d --- /dev/null +++ b/lib/olm-openstack/openstack-ansibleee-subscription.yaml @@ -0,0 +1,13 @@ +--- +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + name: openstack-ansibleee + namespace: openstack-operators +spec: + channel: stable-v1.0 + installPlanApproval: Manual + name: openstack-ansibleee-operator + source: rhoso-testing-operator-catalog + sourceNamespace: openshift-marketplace + startingCSV: openstack-ansibleee-operator.v1.0.3 diff --git a/lib/olm-openstack/openstack-baremetal-subscription.yaml b/lib/olm-openstack/openstack-baremetal-subscription.yaml index 0516199a1..d3bb709ca 100644 --- a/lib/olm-openstack/openstack-baremetal-subscription.yaml +++ b/lib/olm-openstack/openstack-baremetal-subscription.yaml @@ -10,4 +10,4 @@ spec: name: openstack-baremetal-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: openstack-baremetal-operator.v1.0.5 + startingCSV: openstack-baremetal-operator.v1.0.3 diff --git a/lib/olm-openstack/ovn-subscription.yaml b/lib/olm-openstack/ovn-subscription.yaml index 3b20e02b6..52d0cca2b 100644 --- a/lib/olm-openstack/ovn-subscription.yaml +++ b/lib/olm-openstack/ovn-subscription.yaml @@ -10,4 +10,4 @@ spec: name: ovn-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: ovn-operator.v1.0.5 + startingCSV: ovn-operator.v1.0.3 diff --git a/lib/olm-openstack/placement-subscription.yaml b/lib/olm-openstack/placement-subscription.yaml index 8817d61c4..afaa466e0 100644 --- a/lib/olm-openstack/placement-subscription.yaml +++ b/lib/olm-openstack/placement-subscription.yaml @@ -10,4 +10,4 @@ spec: name: placement-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: placement-operator.v1.0.5 + startingCSV: placement-operator.v1.0.3 diff --git a/lib/olm-openstack/rabbitmq-cluster-subscription.yaml b/lib/olm-openstack/rabbitmq-cluster-subscription.yaml index 531ec61c2..67b38f44d 100644 --- a/lib/olm-openstack/rabbitmq-cluster-subscription.yaml +++ b/lib/olm-openstack/rabbitmq-cluster-subscription.yaml @@ -10,4 +10,4 @@ spec: name: rabbitmq-cluster-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: rabbitmq-cluster-operator.v1.0.5 + startingCSV: rabbitmq-cluster-operator.v1.0.3 diff --git a/lib/olm-openstack/subscription.yaml b/lib/olm-openstack/subscription.yaml index 3e38c829b..4c7fb6547 100644 --- a/lib/olm-openstack/subscription.yaml +++ b/lib/olm-openstack/subscription.yaml @@ -10,4 +10,4 @@ spec: name: openstack-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: openstack-operator.v1.0.5 + startingCSV: openstack-operator.v1.0.3 diff --git a/lib/olm-openstack/swift-subscription.yaml b/lib/olm-openstack/swift-subscription.yaml index 782ca33e3..f19f5976d 100644 --- a/lib/olm-openstack/swift-subscription.yaml +++ b/lib/olm-openstack/swift-subscription.yaml @@ -10,4 +10,4 @@ spec: name: swift-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: swift-operator.v1.0.5 + startingCSV: swift-operator.v1.0.3 diff --git a/lib/olm-openstack/telemetry-subscription.yaml b/lib/olm-openstack/telemetry-subscription.yaml index 52863201d..84ed913a0 100644 --- a/lib/olm-openstack/telemetry-subscription.yaml +++ b/lib/olm-openstack/telemetry-subscription.yaml @@ -10,4 +10,4 @@ spec: name: telemetry-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: telemetry-operator.v1.0.5 + startingCSV: telemetry-operator.v1.0.3 From 319dd4d8951d951c6a2a3100825e8e25273549d2 Mon Sep 17 00:00:00 2001 From: Sofer Athlan-Guyot Date: Thu, 6 Feb 2025 11:12:05 +0100 Subject: [PATCH 4/8] [DNM] Test update from v1.0.6 --- lib/olm-openstack/barbican-subscription.yaml | 2 +- lib/olm-openstack/cinder-subscription.yaml | 2 +- lib/olm-openstack/designate-subscription.yaml | 2 +- lib/olm-openstack/glance-subscription.yaml | 2 +- lib/olm-openstack/heat-subscription.yaml | 2 +- lib/olm-openstack/horizon-subscription.yaml | 2 +- lib/olm-openstack/infra-subscription.yaml | 2 +- lib/olm-openstack/ironic-subscription.yaml | 2 +- lib/olm-openstack/keystone-subscription.yaml | 2 +- lib/olm-openstack/manila-subscription.yaml | 2 +- lib/olm-openstack/mariadb-subscription.yaml | 2 +- lib/olm-openstack/neutron-subscription.yaml | 2 +- lib/olm-openstack/nova-subscription.yaml | 2 +- lib/olm-openstack/octavia-subscription.yaml | 2 +- lib/olm-openstack/openstack-ansibleee-subscription.yaml | 2 +- lib/olm-openstack/openstack-baremetal-subscription.yaml | 2 +- lib/olm-openstack/ovn-subscription.yaml | 2 +- lib/olm-openstack/placement-subscription.yaml | 2 +- lib/olm-openstack/rabbitmq-cluster-subscription.yaml | 2 +- lib/olm-openstack/subscription.yaml | 2 +- lib/olm-openstack/swift-subscription.yaml | 2 +- lib/olm-openstack/telemetry-subscription.yaml | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/lib/olm-openstack/barbican-subscription.yaml b/lib/olm-openstack/barbican-subscription.yaml index bd0c0b597..355569ab7 100644 --- a/lib/olm-openstack/barbican-subscription.yaml +++ b/lib/olm-openstack/barbican-subscription.yaml @@ -10,4 +10,4 @@ spec: name: barbican-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: barbican-operator.v1.0.3 + startingCSV: barbican-operator.v1.0.6 diff --git a/lib/olm-openstack/cinder-subscription.yaml b/lib/olm-openstack/cinder-subscription.yaml index 5a3228ea5..10542aef2 100644 --- a/lib/olm-openstack/cinder-subscription.yaml +++ b/lib/olm-openstack/cinder-subscription.yaml @@ -10,4 +10,4 @@ spec: name: cinder-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: cinder-operator.v1.0.3 + startingCSV: cinder-operator.v1.0.6 diff --git a/lib/olm-openstack/designate-subscription.yaml b/lib/olm-openstack/designate-subscription.yaml index e5a640afd..fd61675d0 100644 --- a/lib/olm-openstack/designate-subscription.yaml +++ b/lib/olm-openstack/designate-subscription.yaml @@ -10,4 +10,4 @@ spec: name: designate-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: designate-operator.v1.0.3 + startingCSV: designate-operator.v1.0.6 diff --git a/lib/olm-openstack/glance-subscription.yaml b/lib/olm-openstack/glance-subscription.yaml index e5c996d33..b1db170a4 100644 --- a/lib/olm-openstack/glance-subscription.yaml +++ b/lib/olm-openstack/glance-subscription.yaml @@ -10,4 +10,4 @@ spec: name: glance-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: glance-operator.v1.0.3 + startingCSV: glance-operator.v1.0.6 diff --git a/lib/olm-openstack/heat-subscription.yaml b/lib/olm-openstack/heat-subscription.yaml index 13b840d8b..3d03dab96 100644 --- a/lib/olm-openstack/heat-subscription.yaml +++ b/lib/olm-openstack/heat-subscription.yaml @@ -10,4 +10,4 @@ spec: name: heat-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: heat-operator.v1.0.3 + startingCSV: heat-operator.v1.0.6 diff --git a/lib/olm-openstack/horizon-subscription.yaml b/lib/olm-openstack/horizon-subscription.yaml index 27885db40..85869a26f 100644 --- a/lib/olm-openstack/horizon-subscription.yaml +++ b/lib/olm-openstack/horizon-subscription.yaml @@ -10,4 +10,4 @@ spec: name: horizon-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: horizon-operator.v1.0.3 + startingCSV: horizon-operator.v1.0.6 diff --git a/lib/olm-openstack/infra-subscription.yaml b/lib/olm-openstack/infra-subscription.yaml index 75618526b..062702a03 100644 --- a/lib/olm-openstack/infra-subscription.yaml +++ b/lib/olm-openstack/infra-subscription.yaml @@ -10,4 +10,4 @@ spec: name: infra-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: infra-operator.v1.0.3 + startingCSV: infra-operator.v1.0.6 diff --git a/lib/olm-openstack/ironic-subscription.yaml b/lib/olm-openstack/ironic-subscription.yaml index 461c85778..7c2c0f686 100644 --- a/lib/olm-openstack/ironic-subscription.yaml +++ b/lib/olm-openstack/ironic-subscription.yaml @@ -10,4 +10,4 @@ spec: name: ironic-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: ironic-operator.v1.0.3 + startingCSV: ironic-operator.v1.0.6 diff --git a/lib/olm-openstack/keystone-subscription.yaml b/lib/olm-openstack/keystone-subscription.yaml index 0c9c56ab2..2f01e8f3b 100644 --- a/lib/olm-openstack/keystone-subscription.yaml +++ b/lib/olm-openstack/keystone-subscription.yaml @@ -10,4 +10,4 @@ spec: name: keystone-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: keystone-operator.v1.0.3 + startingCSV: keystone-operator.v1.0.6 diff --git a/lib/olm-openstack/manila-subscription.yaml b/lib/olm-openstack/manila-subscription.yaml index 8bda9e436..4204ff1c8 100644 --- a/lib/olm-openstack/manila-subscription.yaml +++ b/lib/olm-openstack/manila-subscription.yaml @@ -10,4 +10,4 @@ spec: name: manila-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: manila-operator.v1.0.3 + startingCSV: manila-operator.v1.0.6 diff --git a/lib/olm-openstack/mariadb-subscription.yaml b/lib/olm-openstack/mariadb-subscription.yaml index 63d4a085c..3fb96fe93 100644 --- a/lib/olm-openstack/mariadb-subscription.yaml +++ b/lib/olm-openstack/mariadb-subscription.yaml @@ -10,4 +10,4 @@ spec: name: mariadb-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: mariadb-operator.v1.0.3 + startingCSV: mariadb-operator.v1.0.6 diff --git a/lib/olm-openstack/neutron-subscription.yaml b/lib/olm-openstack/neutron-subscription.yaml index 9de69102c..b90a5a9ed 100644 --- a/lib/olm-openstack/neutron-subscription.yaml +++ b/lib/olm-openstack/neutron-subscription.yaml @@ -10,4 +10,4 @@ spec: name: neutron-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: neutron-operator.v1.0.3 + startingCSV: neutron-operator.v1.0.6 diff --git a/lib/olm-openstack/nova-subscription.yaml b/lib/olm-openstack/nova-subscription.yaml index 1a5010a5a..3502a521e 100644 --- a/lib/olm-openstack/nova-subscription.yaml +++ b/lib/olm-openstack/nova-subscription.yaml @@ -10,4 +10,4 @@ spec: name: nova-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: nova-operator.v1.0.3 + startingCSV: nova-operator.v1.0.6 diff --git a/lib/olm-openstack/octavia-subscription.yaml b/lib/olm-openstack/octavia-subscription.yaml index 774794a11..99e65d51e 100644 --- a/lib/olm-openstack/octavia-subscription.yaml +++ b/lib/olm-openstack/octavia-subscription.yaml @@ -10,4 +10,4 @@ spec: name: octavia-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: octavia-operator.v1.0.3 + startingCSV: octavia-operator.v1.0.6 diff --git a/lib/olm-openstack/openstack-ansibleee-subscription.yaml b/lib/olm-openstack/openstack-ansibleee-subscription.yaml index eeba2759d..fb6e32e8f 100644 --- a/lib/olm-openstack/openstack-ansibleee-subscription.yaml +++ b/lib/olm-openstack/openstack-ansibleee-subscription.yaml @@ -10,4 +10,4 @@ spec: name: openstack-ansibleee-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: openstack-ansibleee-operator.v1.0.3 + startingCSV: openstack-ansibleee-operator.v1.0.6 diff --git a/lib/olm-openstack/openstack-baremetal-subscription.yaml b/lib/olm-openstack/openstack-baremetal-subscription.yaml index d3bb709ca..584d465cb 100644 --- a/lib/olm-openstack/openstack-baremetal-subscription.yaml +++ b/lib/olm-openstack/openstack-baremetal-subscription.yaml @@ -10,4 +10,4 @@ spec: name: openstack-baremetal-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: openstack-baremetal-operator.v1.0.3 + startingCSV: openstack-baremetal-operator.v1.0.6 diff --git a/lib/olm-openstack/ovn-subscription.yaml b/lib/olm-openstack/ovn-subscription.yaml index 52d0cca2b..3861c021e 100644 --- a/lib/olm-openstack/ovn-subscription.yaml +++ b/lib/olm-openstack/ovn-subscription.yaml @@ -10,4 +10,4 @@ spec: name: ovn-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: ovn-operator.v1.0.3 + startingCSV: ovn-operator.v1.0.6 diff --git a/lib/olm-openstack/placement-subscription.yaml b/lib/olm-openstack/placement-subscription.yaml index afaa466e0..0af866f10 100644 --- a/lib/olm-openstack/placement-subscription.yaml +++ b/lib/olm-openstack/placement-subscription.yaml @@ -10,4 +10,4 @@ spec: name: placement-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: placement-operator.v1.0.3 + startingCSV: placement-operator.v1.0.6 diff --git a/lib/olm-openstack/rabbitmq-cluster-subscription.yaml b/lib/olm-openstack/rabbitmq-cluster-subscription.yaml index 67b38f44d..06d8fa1d2 100644 --- a/lib/olm-openstack/rabbitmq-cluster-subscription.yaml +++ b/lib/olm-openstack/rabbitmq-cluster-subscription.yaml @@ -10,4 +10,4 @@ spec: name: rabbitmq-cluster-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: rabbitmq-cluster-operator.v1.0.3 + startingCSV: rabbitmq-cluster-operator.v1.0.6 diff --git a/lib/olm-openstack/subscription.yaml b/lib/olm-openstack/subscription.yaml index 4c7fb6547..73a578b53 100644 --- a/lib/olm-openstack/subscription.yaml +++ b/lib/olm-openstack/subscription.yaml @@ -10,4 +10,4 @@ spec: name: openstack-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: openstack-operator.v1.0.3 + startingCSV: openstack-operator.v1.0.6 diff --git a/lib/olm-openstack/swift-subscription.yaml b/lib/olm-openstack/swift-subscription.yaml index f19f5976d..1edac3987 100644 --- a/lib/olm-openstack/swift-subscription.yaml +++ b/lib/olm-openstack/swift-subscription.yaml @@ -10,4 +10,4 @@ spec: name: swift-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: swift-operator.v1.0.3 + startingCSV: swift-operator.v1.0.6 diff --git a/lib/olm-openstack/telemetry-subscription.yaml b/lib/olm-openstack/telemetry-subscription.yaml index 84ed913a0..6b886320a 100644 --- a/lib/olm-openstack/telemetry-subscription.yaml +++ b/lib/olm-openstack/telemetry-subscription.yaml @@ -10,4 +10,4 @@ spec: name: telemetry-operator source: rhoso-testing-operator-catalog sourceNamespace: openshift-marketplace - startingCSV: telemetry-operator.v1.0.3 + startingCSV: telemetry-operator.v1.0.6 From 6e8effe8d8fc1e167d81123dca17a8a364fcb378 Mon Sep 17 00:00:00 2001 From: Sofer Athlan-Guyot Date: Thu, 6 Feb 2025 11:58:02 +0100 Subject: [PATCH 5/8] Testing registry --- lib/olm-openstack/catalogsource.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/olm-openstack/catalogsource.yaml b/lib/olm-openstack/catalogsource.yaml index 27f3a2461..54167ebb8 100644 --- a/lib/olm-openstack/catalogsource.yaml +++ b/lib/olm-openstack/catalogsource.yaml @@ -5,7 +5,7 @@ metadata: name: rhoso-testing-operator-catalog namespace: openshift-marketplace spec: - image: brew.registry.redhat.io/rh-osbs/iib:892408 + image: brew.registry.redhat.com/rh-osbs/iib:910638 sourceType: grpc displayName: RHOSO Operator Test Catalog publisher: RHOS Delivery From a4156cf5fa3224281af8db2a8625aee8f664d64c Mon Sep 17 00:00:00 2001 From: Sofer Athlan-Guyot Date: Thu, 6 Feb 2025 12:07:36 +0100 Subject: [PATCH 6/8] Remove the ansiblee-subscription, just to make sure. --- .../openstack-ansibleee-subscription.yaml | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 lib/olm-openstack/openstack-ansibleee-subscription.yaml diff --git a/lib/olm-openstack/openstack-ansibleee-subscription.yaml b/lib/olm-openstack/openstack-ansibleee-subscription.yaml deleted file mode 100644 index fb6e32e8f..000000000 --- a/lib/olm-openstack/openstack-ansibleee-subscription.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -apiVersion: operators.coreos.com/v1alpha1 -kind: Subscription -metadata: - name: openstack-ansibleee - namespace: openstack-operators -spec: - channel: stable-v1.0 - installPlanApproval: Manual - name: openstack-ansibleee-operator - source: rhoso-testing-operator-catalog - sourceNamespace: openshift-marketplace - startingCSV: openstack-ansibleee-operator.v1.0.6 From c3c950762aef505759fca5c0e1196cf13037f22f Mon Sep 17 00:00:00 2001 From: Sofer Athlan-Guyot Date: Fri, 7 Feb 2025 13:05:52 +0100 Subject: [PATCH 7/8] Fix catalog url. --- lib/olm-openstack/catalogsource.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/olm-openstack/catalogsource.yaml b/lib/olm-openstack/catalogsource.yaml index 54167ebb8..ad483e2f4 100644 --- a/lib/olm-openstack/catalogsource.yaml +++ b/lib/olm-openstack/catalogsource.yaml @@ -5,7 +5,7 @@ metadata: name: rhoso-testing-operator-catalog namespace: openshift-marketplace spec: - image: brew.registry.redhat.com/rh-osbs/iib:910638 + image: brew.registry.redhat.io/rh-osbs/iib:910638 sourceType: grpc displayName: RHOSO Operator Test Catalog publisher: RHOS Delivery From ab878349756f5327b57f663f6fe133a9dd074b92 Mon Sep 17 00:00:00 2001 From: Sofer Athlan-Guyot Date: Thu, 13 Feb 2025 18:05:45 +0100 Subject: [PATCH 8/8] That particular image cannot be used as an catalogsource. We bumped into a corner case issue in OLM. --- lib/olm-openstack/catalogsource.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/olm-openstack/catalogsource.yaml b/lib/olm-openstack/catalogsource.yaml index ad483e2f4..27f3a2461 100644 --- a/lib/olm-openstack/catalogsource.yaml +++ b/lib/olm-openstack/catalogsource.yaml @@ -5,7 +5,7 @@ metadata: name: rhoso-testing-operator-catalog namespace: openshift-marketplace spec: - image: brew.registry.redhat.io/rh-osbs/iib:910638 + image: brew.registry.redhat.io/rh-osbs/iib:892408 sourceType: grpc displayName: RHOSO Operator Test Catalog publisher: RHOS Delivery