From 1dd2f05efb9c680f978e640b57b1b8de244c9ec1 Mon Sep 17 00:00:00 2001 From: Sunil Thaha Date: Thu, 25 Jan 2024 12:43:59 +1000 Subject: [PATCH 1/3] fix(bundle): ensure bundle can be installed on OS 4.15 Fixes: https://github.com/sustainable-computing-io/kepler-operator/issues/344 Signed-off-by: Sunil Thaha --- hack/bundle.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/bundle.sh b/hack/bundle.sh index 36f8ddb6..829ea390 100755 --- a/hack/bundle.sh +++ b/hack/bundle.sh @@ -95,7 +95,7 @@ main() { info "Adding additional metadata annotations" cat <<-EOF >>bundle/metadata/annotations.yaml # Annotations for OpenShift version - com.redhat.openshift.versions: "v4.11-v4.14" + com.redhat.openshift.versions: "v4.12-v4.17" EOF run operator-sdk bundle validate ./bundle \ From 5e25c4bcdbb9eab2a839fb0830cbe6418271cf4a Mon Sep 17 00:00:00 2001 From: Sunil Thaha Date: Thu, 25 Jan 2024 12:44:39 +1000 Subject: [PATCH 2/3] fix: publish only to alpha channel Signed-off-by: Sunil Thaha --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 24d89ac8..21c6472f 100644 --- a/Makefile +++ b/Makefile @@ -288,7 +288,7 @@ escapes_detect: mod-tidy @go build -tags $(GO_BUILD_TAGS) -gcflags="-m -l" ./... 2>&1 | grep "escapes to heap" || true -CHANNELS ?=alpha,dev-preview +CHANNELS ?=alpha ##@ OLM bundle # From db852c0497626921d4fd5523182abe384ff54d24 Mon Sep 17 00:00:00 2001 From: Sunil Thaha Date: Thu, 25 Jan 2024 12:45:15 +1000 Subject: [PATCH 3/3] chore: make bundle Signed-off-by: Sunil Thaha --- bundle.Dockerfile | 2 +- bundle/metadata/annotations.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bundle.Dockerfile b/bundle.Dockerfile index 431a229b..57eda2d3 100644 --- a/bundle.Dockerfile +++ b/bundle.Dockerfile @@ -5,7 +5,7 @@ LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1 LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/ LABEL operators.operatorframework.io.bundle.package.v1=kepler-operator -LABEL operators.operatorframework.io.bundle.channels.v1=alpha,dev-preview +LABEL operators.operatorframework.io.bundle.channels.v1=alpha LABEL operators.operatorframework.io.bundle.channel.default.v1=alpha LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.27.0 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1 diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml index 6cd8559b..6c3ba580 100644 --- a/bundle/metadata/annotations.yaml +++ b/bundle/metadata/annotations.yaml @@ -4,7 +4,7 @@ annotations: operators.operatorframework.io.bundle.manifests.v1: manifests/ operators.operatorframework.io.bundle.metadata.v1: metadata/ operators.operatorframework.io.bundle.package.v1: kepler-operator - operators.operatorframework.io.bundle.channels.v1: alpha,dev-preview + operators.operatorframework.io.bundle.channels.v1: alpha operators.operatorframework.io.bundle.channel.default.v1: alpha operators.operatorframework.io.metrics.builder: operator-sdk-v1.27.0 operators.operatorframework.io.metrics.mediatype.v1: metrics+v1 @@ -14,4 +14,4 @@ annotations: operators.operatorframework.io.test.mediatype.v1: scorecard+v1 operators.operatorframework.io.test.config.v1: tests/scorecard/ # Annotations for OpenShift version - com.redhat.openshift.versions: "v4.11-v4.14" + com.redhat.openshift.versions: "v4.12-v4.17"