diff --git a/operator/Makefile b/operator/Makefile index eae136937425d..fa5566829f3e2 100644 --- a/operator/Makefile +++ b/operator/Makefile @@ -416,6 +416,10 @@ bundle: yq manifests kustomize operator-sdk ## Generate bundle manifests and met $(KUSTOMIZE) build config/manifests | $(OPERATOR_SDK) generate bundle $(BUNDLE_GEN_FLAGS) # Fix the createdAt annotation $(YQ) -i '.metadata.annotations.createdAt = ""' bundle/manifests/rhacs-operator.clusterserviceversion.yaml +# Remove autogenerated operator channel LABEL from the bundle to avoid confusion because it's ignored anyways. +# There's still channels annotation in bundle/metadata/annotations.yaml and it cannot be removed because the +# `bundle validate` command below would fail (despite the annotation still being igored by the index builds). + sed -i'.bak' -e '/operators\.operatorframework\.io\.bundle\.channel/d' bundle.Dockerfile # Delete lines that copy the original bundle files in bundle.Dockerfile (we can't just use `rm` in scratch image). # Post-processed files will be copied instead, as configured in bundle.Dockerfile.extra. sed -i'.bak' -e '/# Copy files to locations specified by labels./d' bundle.Dockerfile diff --git a/operator/bundle.Dockerfile b/operator/bundle.Dockerfile index 910794a6e73a6..4c8f6090339e8 100644 --- a/operator/bundle.Dockerfile +++ b/operator/bundle.Dockerfile @@ -5,7 +5,6 @@ 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=rhacs-operator -LABEL operators.operatorframework.io.bundle.channels.v1=alpha LABEL operators.operatorframework.io.metrics.builder=operator-sdk-unknown LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v4 diff --git a/operator/konflux.bundle.Dockerfile b/operator/konflux.bundle.Dockerfile index 917ec39624a73..58e87bff7d6ff 100644 --- a/operator/konflux.bundle.Dockerfile +++ b/operator/konflux.bundle.Dockerfile @@ -66,7 +66,7 @@ RUN mkdir -p build/ && \ cp -v ../config-controller/config/crd/bases/config.stackrox.io_securitypolicies.yaml build/bundle/manifests/ && \ ./bundle_helpers/patch-csv.py \ --use-version "${OPERATOR_IMAGE_TAG}" \ - --first-version 3.62.0 \ + --first-version 4.0.0 \ --related-images-mode=konflux \ --operator-image "${OPERATOR_IMAGE_REF}" \ --add-supported-arch amd64 \ @@ -105,8 +105,6 @@ 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=rhacs-operator -LABEL operators.operatorframework.io.bundle.channels.v1=fast -LABEL operators.operatorframework.io.bundle.channel.default.v1=fast LABEL operators.operatorframework.io.metrics.builder=operator-sdk-unknown LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3