Skip to content

Add Supporting to OpenShift 4.11 and later to the bundle #182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 13, 2023
Merged

Add Supporting to OpenShift 4.11 and later to the bundle #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eac2858
Add Supporting to OpenShift 4.11 and later to the bundle
ricardozanini Jul 7, 2023
3a1bbbe
Fix file gen
ricardozanini Jul 11, 2023
b17fb1d
Fix makefile gen
ricardozanini Jul 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions bundle.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions bundle/manifests/sonataflow-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this correct?

namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -537,4 +537,4 @@ spec:
minKubeVersion: 1.23.0
provider:
name: Red Hat
version: latest
version: 2.0.0-snapshot
1 change: 1 addition & 0 deletions bundle/metadata/annotations.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down