Skip to content

ROX-26698: Remove ignored operator channel labels #13341

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
msugakov merged 5 commits into from
Nov 18, 2024
Merged

ROX-26698: Remove ignored operator channel labels #13341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cf8b637
Remove operator channel label from the GHA-built bundle dockerfile
msugakov Nov 14, 2024
084085f
Remove channel labels from Konflux bundle dockerfile
msugakov Nov 14, 2024
c2461dc
Update first version for Konflux builds
msugakov Nov 14, 2024
1a8bff0
Eliminate misleading channel from annotations.yaml
msugakov Nov 15, 2024
f6b8943
Revert "Eliminate misleading channel from annotations.yaml"
msugakov Nov 15, 2024
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: 4 additions & 0 deletions operator/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion operator/bundle.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions operator/konflux.bundle.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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
Expand Down