From d898d6426090b8c4fddd71fb54dfddfae55b70db Mon Sep 17 00:00:00 2001 From: mprahl Date: Wed, 13 Sep 2023 09:31:03 -0400 Subject: [PATCH] Quote the channel annotations to be treated as strings Relates: https://issues.redhat.com/browse/CVP-3890 Signed-off-by: mprahl --- Makefile | 1 + bundle/metadata/annotations.yaml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 08df76ce..dec7d51c 100644 --- a/Makefile +++ b/Makefile @@ -272,6 +272,7 @@ bundle: operator-sdk manifests kustomize ## Generate bundle manifests and metada sed -i 's/mediatype: \"\"/mediatype: \"image\/svg+xml\"/g' bundle/manifests/gatekeeper-operator.clusterserviceversion.yaml sed -i 's/^ version:.*/ version: $(VERSION)/' bundle/manifests/gatekeeper-operator.clusterserviceversion.yaml sed -i '/^ createdAt:.*/d' bundle/manifests/gatekeeper-operator.clusterserviceversion.yaml + sed -i 's/$(CHANNELS)/"$(CHANNELS)"/g' bundle/metadata/annotations.yaml ifneq ($(REPLACES_VERSION), none) sed -i 's/^ replaces:.*/ replaces: gatekeeper-operator.v$(REPLACES_VERSION)/' bundle/manifests/gatekeeper-operator.clusterserviceversion.yaml else diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml index 94a34d96..c50afea5 100644 --- a/bundle/metadata/annotations.yaml +++ b/bundle/metadata/annotations.yaml @@ -4,8 +4,8 @@ annotations: operators.operatorframework.io.bundle.manifests.v1: manifests/ operators.operatorframework.io.bundle.metadata.v1: metadata/ operators.operatorframework.io.bundle.package.v1: gatekeeper-operator - operators.operatorframework.io.bundle.channels.v1: 3.11 - operators.operatorframework.io.bundle.channel.default.v1: 3.11 + operators.operatorframework.io.bundle.channels.v1: "3.11" + operators.operatorframework.io.bundle.channel.default.v1: "3.11" operators.operatorframework.io.metrics.builder: operator-sdk-v1.28.1 operators.operatorframework.io.metrics.mediatype.v1: metrics+v1 operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3