diff --git a/Makefile b/Makefile index fae54ac42..1d9d4be63 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,9 @@ IMAGE_TAG_BASE ?= quay.io/kiegroup/kogito-serverless-operator-nightly BUNDLE_IMG ?= $(IMAGE_TAG_BASE)-bundle:v$(VERSION) # BUNDLE_GEN_FLAGS are the flags passed to the operator-sdk generate bundle command -BUNDLE_GEN_FLAGS ?= -q --overwrite --version $(VERSION) $(BUNDLE_METADATA_OPTS) +# TODO: review this flag once we upgrade https://github.com/operator-framework/operator-sdk/issues/4992 (https://issues.redhat.com/browse/KOGITO-9428) +# TODO: It is preventing us from adding new annotations to bundle/metadata/annotations.yaml +BUNDLE_GEN_FLAGS ?= -q --overwrite=false --version $(VERSION) $(BUNDLE_METADATA_OPTS) # Container runtime engine used for building the images BUILDER ?= podman diff --git a/bundle.Dockerfile b/bundle.Dockerfile index c6c43db51..4cbe45a02 100644 --- a/bundle.Dockerfile +++ b/bundle.Dockerfile @@ -9,6 +9,7 @@ LABEL operators.operatorframework.io.bundle.channels.v1=alpha LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.25.0 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3 +LABEL com.redhat.openshift.versions=v4.11 # Labels for testing. LABEL operators.operatorframework.io.test.mediatype.v1=scorecard+v1 diff --git a/bundle/manifests/sonataflow-operator.clusterserviceversion.yaml b/bundle/manifests/sonataflow-operator.clusterserviceversion.yaml index 80363a2a9..345b49b35 100644 --- a/bundle/manifests/sonataflow-operator.clusterserviceversion.yaml +++ b/bundle/manifests/sonataflow-operator.clusterserviceversion.yaml @@ -101,7 +101,7 @@ metadata: operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/kiegroup/kogito-serverless-operator support: Red Hat - name: sonataflow-operator.vlatest + name: sonataflow-operator.v2.0.0-snapshot namespace: placeholder spec: apiservicedefinitions: {} @@ -446,7 +446,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - image: quay.io/kiegroup/kogito-serverless-operator-nightly:latest + image: quay.io/kiegroup/kogito-serverless-operator-nightly:2.0.0-snapshot livenessProbe: httpGet: path: /healthz @@ -537,4 +537,4 @@ spec: minKubeVersion: 1.23.0 provider: name: Red Hat - version: latest + version: 2.0.0-snapshot diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml index 7a220108b..68eab166f 100644 --- a/bundle/metadata/annotations.yaml +++ b/bundle/metadata/annotations.yaml @@ -8,6 +8,7 @@ annotations: operators.operatorframework.io.metrics.builder: operator-sdk-v1.25.0 operators.operatorframework.io.metrics.mediatype.v1: metrics+v1 operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3 + com.redhat.openshift.versions: v4.11 # Annotations for testing. operators.operatorframework.io.test.mediatype.v1: scorecard+v1