Skip to content

Commit d8e68d8

Browse files
Add Supporting to OpenShift 4.11 and later to the bundle (#182)
* Add Supporting to OpenShift 4.11 and later to the bundle * Fix file gen Signed-off-by: Ricardo Zanini <zanini@redhat.com> * Fix makefile gen Signed-off-by: Ricardo Zanini <zanini@redhat.com> --------- Signed-off-by: Ricardo Zanini <zanini@redhat.com>
1 parent 1031330 commit d8e68d8

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@ IMAGE_TAG_BASE ?= quay.io/kiegroup/kogito-serverless-operator-nightly
3636
BUNDLE_IMG ?= $(IMAGE_TAG_BASE)-bundle:v$(VERSION)
3737

3838
# BUNDLE_GEN_FLAGS are the flags passed to the operator-sdk generate bundle command
39-
BUNDLE_GEN_FLAGS ?= -q --overwrite --version $(VERSION) $(BUNDLE_METADATA_OPTS)
39+
# TODO: review this flag once we upgrade https://github.com/operator-framework/operator-sdk/issues/4992 (https://issues.redhat.com/browse/KOGITO-9428)
40+
# TODO: It is preventing us from adding new annotations to bundle/metadata/annotations.yaml
41+
BUNDLE_GEN_FLAGS ?= -q --overwrite=false --version $(VERSION) $(BUNDLE_METADATA_OPTS)
4042

4143
# Container runtime engine used for building the images
4244
BUILDER ?= podman

bundle.Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ LABEL operators.operatorframework.io.bundle.channels.v1=alpha
99
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.25.0
1010
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
1111
LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
12+
LABEL com.redhat.openshift.versions=v4.11
1213

1314
# Labels for testing.
1415
LABEL operators.operatorframework.io.test.mediatype.v1=scorecard+v1

bundle/metadata/annotations.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ annotations:
88
operators.operatorframework.io.metrics.builder: operator-sdk-v1.25.0
99
operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
1010
operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3
11+
com.redhat.openshift.versions: v4.11
1112

1213
# Annotations for testing.
1314
operators.operatorframework.io.test.mediatype.v1: scorecard+v1

0 commit comments

Comments
 (0)