From 200cf124d18ff1fd431f1adb23074899d6aec84c Mon Sep 17 00:00:00 2001 From: Nick Boldt Date: Mon, 26 Feb 2024 05:37:41 -0400 Subject: [PATCH] feat(seamless) chore: add `skipranges` and `replaces` logic TODOs to CSV (#231) * feat(seamless) chore: add skipranges and replaces logic TODOs, which we can enable when 0.1 and 1.1 are live alternatively, we could enable this sooner but then to install 1.2 you have to FIRST install 1.1, etc. Signed-off-by: Nick Boldt * apply same change to config/manifests/bases/backstage-operator.clusterserviceversion.yaml Signed-off-by: Nick Boldt --------- Signed-off-by: Nick Boldt --- .rhdh/bundle/manifests/rhdh-operator.csv.yaml | 3 +++ .../backstage-operator.clusterserviceversion.yaml | 3 +++ .../bases/backstage-operator.clusterserviceversion.yaml | 7 +++++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.rhdh/bundle/manifests/rhdh-operator.csv.yaml b/.rhdh/bundle/manifests/rhdh-operator.csv.yaml index 8c54345c..b11a78eb 100644 --- a/.rhdh/bundle/manifests/rhdh-operator.csv.yaml +++ b/.rhdh/bundle/manifests/rhdh-operator.csv.yaml @@ -43,6 +43,7 @@ metadata: features.operators.openshift.io/token-auth-gcp: "false" repository: https://gitlab.cee.redhat.com/rhidp/rhdh/ support: Red Hat + skipRange: '>=1.0.0 <1.2.0' name: rhdh-operator.v1.2.0 namespace: placeholder spec: @@ -341,3 +342,5 @@ spec: name: Red Hat Inc. url: https://www.redhat.com/ version: 1.2.0 + # TODO: once we have a published 1.1.0 version in RHEC, we can use the replaces logic to support seamless upgrades + # replaces: rhdh-operator.v1.1.0 diff --git a/bundle/manifests/backstage-operator.clusterserviceversion.yaml b/bundle/manifests/backstage-operator.clusterserviceversion.yaml index 0d6d68ed..062945e0 100644 --- a/bundle/manifests/backstage-operator.clusterserviceversion.yaml +++ b/bundle/manifests/backstage-operator.clusterserviceversion.yaml @@ -25,6 +25,7 @@ metadata: operatorframework.io/suggested-namespace: backstage-system operators.operatorframework.io/builder: operator-sdk-v1.33.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 + skipRange: '>=0.0.1 <0.2.0' name: backstage-operator.v0.2.0 namespace: placeholder spec: @@ -327,3 +328,5 @@ spec: - image: quay.io/janus-idp/backstage-showcase:latest name: backstage version: 0.2.0 + # TODO: once we have a published 0.1.0 version in Quay, we can use the replaces logic to support seamless upgrades + # replaces: backstage-operator.v0.1.0 diff --git a/config/manifests/bases/backstage-operator.clusterserviceversion.yaml b/config/manifests/bases/backstage-operator.clusterserviceversion.yaml index 80558969..495399a5 100644 --- a/config/manifests/bases/backstage-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/backstage-operator.clusterserviceversion.yaml @@ -5,7 +5,8 @@ metadata: alm-examples: '[]' capabilities: Seamless Upgrades operatorframework.io/suggested-namespace: backstage-system - name: backstage-operator.v0.0.0 + skipRange: '>=0.0.1 <0.2.0' + name: backstage-operator.v0.2.0 namespace: placeholder spec: apiservicedefinitions: {} @@ -52,4 +53,6 @@ spec: provider: name: Red Hat Inc. url: https://www.redhat.com/ - version: 0.0.0 + version: 0.2.0 + # TODO: once we have a published 0.1.0 version in Quay, we can use the replaces logic to support seamless upgrades + # replaces: backstage-operator.v0.1.0