From 6ec7dc874c76f63a3b44c9bcf65380d8471face5 Mon Sep 17 00:00:00 2001 From: Jeremy Ary Date: Wed, 20 Oct 2021 09:57:56 -0500 Subject: [PATCH] move to v0.1.3 requiring OCP 4.9+ --- Makefile | 4 ++-- bundle.Dockerfile | 2 +- .../manifests/dbaas-operator.clusterserviceversion.yaml | 8 ++++---- bundle/metadata/annotations.yaml | 2 +- config/manager/kustomization.yaml | 2 +- .../bases/dbaas-operator.clusterserviceversion.yaml | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 3794e040..8c87f7a0 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ # To re-generate a bundle for another specific version without changing the standard setup, you can: # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2) # - use environment variables to overwrite this value (e.g export VERSION=0.0.2) -VERSION ?= 0.1.2 +VERSION ?= 0.1.3 # OLD_BUNDLE_VERSIONS defines the comma separated list of versions of old bundles to add to the index. # @@ -12,7 +12,7 @@ VERSION ?= 0.1.2 # need to uncomment & add the old bundles - the existing "from-index" catalog already has those. # # If you are developing and pushing against your OWN quay for testing, you likely need to uncomment -#OLD_BUNDLE_VERSIONS ?= 0.1.0,0.1.1 +#OLD_BUNDLE_VERSIONS ?= 0.1.0,0.1.1,0.1.2 # CATALOG_VERSION defines the version of the index image. CATALOG_VERSION ?= 0.1 diff --git a/bundle.Dockerfile b/bundle.Dockerfile index 03185971..46b8991c 100644 --- a/bundle.Dockerfile +++ b/bundle.Dockerfile @@ -1,7 +1,7 @@ FROM scratch # RH OLM annotations -LABEL com.redhat.openshift.versions="v4.8" +LABEL com.redhat.openshift.versions="v4.9" LABEL com.redhat.delivery.operator.bundle=true # Core bundle labels. diff --git a/bundle/manifests/dbaas-operator.clusterserviceversion.yaml b/bundle/manifests/dbaas-operator.clusterserviceversion.yaml index 8f17c705..ea406d7c 100644 --- a/bundle/manifests/dbaas-operator.clusterserviceversion.yaml +++ b/bundle/manifests/dbaas-operator.clusterserviceversion.yaml @@ -123,7 +123,7 @@ metadata: operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/RHEcosystemAppEng/dbaas-operator support: dbaas-alpha-support@redhat.com - name: dbaas-operator.v0.1.2 + name: dbaas-operator.v0.1.3 namespace: placeholder spec: apiservicedefinitions: {} @@ -438,7 +438,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - image: quay.io/ecosystem-appeng/dbaas-operator:v0.1.2 + image: quay.io/ecosystem-appeng/dbaas-operator:v0.1.3 imagePullPolicy: Always livenessProbe: httpGet: @@ -528,8 +528,8 @@ spec: provider: name: Red Hat url: https://www.redhat.com - replaces: dbaas-operator.v0.1.1 - version: 0.1.2 + replaces: dbaas-operator.v0.1.2 + version: 0.1.3 webhookdefinitions: - admissionReviewVersions: - v1 diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml index ceed887b..6a942e26 100644 --- a/bundle/metadata/annotations.yaml +++ b/bundle/metadata/annotations.yaml @@ -1,6 +1,6 @@ annotations: # RH OLM annotations - com.redhat.openshift.versions: v4.8 + com.redhat.openshift.versions: v4.9 com.redhat.delivery.operator.bundle: true # Core bundle annotations. diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 8a9e0464..0cb4c71b 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -13,4 +13,4 @@ kind: Kustomization images: - name: controller newName: quay.io/ecosystem-appeng/dbaas-operator - newTag: v0.1.2 + newTag: v0.1.3 diff --git a/config/manifests/bases/dbaas-operator.clusterserviceversion.yaml b/config/manifests/bases/dbaas-operator.clusterserviceversion.yaml index 6a68962e..7c4d8560 100644 --- a/config/manifests/bases/dbaas-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/dbaas-operator.clusterserviceversion.yaml @@ -138,5 +138,5 @@ spec: provider: name: Red Hat url: https://www.redhat.com - replaces: dbaas-operator.v0.1.1 + replaces: dbaas-operator.v0.1.2 version: 0.0.0