Skip to content

ROX-26698: Remove ignored operator channel labels#13341

Merged
msugakov merged 5 commits intomasterfrom
misha/ROX-26698-reduce-channels-discrepancies
Nov 18, 2024
Merged

ROX-26698: Remove ignored operator channel labels#13341
msugakov merged 5 commits intomasterfrom
misha/ROX-26698-reduce-channels-discrepancies

Conversation

@msugakov
Copy link
Contributor

@msugakov msugakov commented Nov 14, 2024

Description

Here I remove misleading channel labels from GHA- and Konflux-built bundle Dockerfiles.
In both cases the operator channels are managed explicitly.

In case of GHA, it's done in this script

YQ_FILTER_CHANNEL_DOCUMENT='.schema=="olm.channel" and .name=="latest"'
YQ_NEW_BUNDLE_ENTRY=$(cat <<EOF
{
"name": "rhacs-operator.v${BUNDLE_VERSION}",
"replaces": "rhacs-operator.v${REPLACED_VERSION}",
"skipRange": ">= ${REPLACED_VERSION} < ${BUNDLE_VERSION}"
}

In case of Konflux, channels are managed in https://github.com/stackrox/operator-index/ repo.

I did not remove it from

operators.operatorframework.io.bundle.channels.v1: alpha

because I could not make it work against multiple operator-sdk bundle validate calls which would fail:

operator-sdk bundle validate ./build/bundle --select-optional suite=operatorframework
time="2024-11-15T17:50:25Z" level=error msg="error validating format in build/bundle: Bundle validation errors: Missing annotation \"operators.operatorframework.io.bundle.channels.v1\",Expecting annotation \"operators.operatorframework.io.bundle.channels.v1\" to have non-empty value"

This asks for disentangling Makefile targets (starting from index-build -> bundle-post-process) and so is likely a big fun for another time.

Also, I correct --first-version in Konflux patch-csv.py call. It is an unrelated change and it has no practical effect but makes the code more truthy.

User-facing documentation

  • CHANGELOG is updated OR update is not needed
  • documentation PR is created and is linked above OR is not needed

Testing and quality

  • the change is production ready: the change is GA or otherwise the functionality is gated by a feature flag
  • CI results are inspected

Automated testing

No automated testing changes.

How I validated my change

Relying on CI.

@msugakov msugakov added konflux-build Run Konflux in PR. Push commit to trigger it. backport-for-4.6-konflux-release https://redhat-internal.slack.com/archives/C05TS9N0S7L/p1730134914487439 labels Nov 14, 2024
@openshift-ci
Copy link

openshift-ci bot commented Nov 14, 2024

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@rhacs-bot
Copy link
Contributor

rhacs-bot commented Nov 14, 2024

Images are ready for the commit at f6b8943.

To use with deploy scripts, first export MAIN_IMAGE_TAG=4.7.x-130-gf6b8943a8f.

@msugakov msugakov changed the title ROX-26698: wip ROX-26698: Remove ignored operator channel labels Nov 14, 2024
@msugakov msugakov marked this pull request as ready for review November 14, 2024 19:07
@msugakov msugakov requested a review from a team as a code owner November 14, 2024 19:07
@msugakov msugakov requested review from GrimmiMeloni and removed request for a team November 14, 2024 19:07
@codecov
Copy link

codecov bot commented Nov 14, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 48.54%. Comparing base (be035c3) to head (f6b8943).
Report is 7 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master   #13341      +/-   ##
==========================================
+ Coverage   48.50%   48.54%   +0.04%     
==========================================
  Files        2470     2470              
  Lines      178320   178403      +83     
==========================================
+ Hits        86487    86599     +112     
+ Misses      84900    84873      -27     
+ Partials     6933     6931       -2     
Flag Coverage Δ
go-unit-tests 48.54% <ø> (+0.04%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@msugakov
Copy link
Contributor Author

/retest

Its value does not play any role after we actually published 4.0.0
and 4.1.0 (which was long ago) but it is appealing to keep the values
right.

First version 4.0.0 signifies that our upgrade graph was broken on
it.
@msugakov msugakov force-pushed the misha/ROX-26698-reduce-channels-discrepancies branch from 252e785 to c2461dc Compare November 15, 2024 08:13
@msugakov
Copy link
Contributor Author

/retest ke-operator-e2e-tests

@openshift-ci

This comment was marked as outdated.

@msugakov
Copy link
Contributor Author

/retest gke-operator-e2e-tests

@msugakov
Copy link
Contributor Author

/retest ocp-4-17-operator-e2e-tests

@stackrox stackrox deleted a comment from openshift-ci bot Nov 15, 2024
@stackrox stackrox deleted a comment from openshift-ci bot Nov 15, 2024
@msugakov
Copy link
Contributor Author

/test gke-operator-e2e-tests

@msugakov
Copy link
Contributor Author

/test ocp-4-17-operator-e2e-tests

This reverts commit 1a8bff0.

Because there are more operator-sdk bundle validate calls down
the line.
@msugakov msugakov merged commit 784f3d2 into master Nov 18, 2024
@msugakov msugakov deleted the misha/ROX-26698-reduce-channels-discrepancies branch November 18, 2024 09:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/operator backport-for-4.6-konflux-release https://redhat-internal.slack.com/archives/C05TS9N0S7L/p1730134914487439 konflux-build Run Konflux in PR. Push commit to trigger it.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants