Skip to content

Do not remove servicemeshoperator3.clusterserviceversion.yaml when#757

Merged
openshift-merge-bot[bot] merged 1 commit intoopenshift-service-mesh:mainfrom
FilipB:sync-upstream
Mar 26, 2026
Merged

Do not remove servicemeshoperator3.clusterserviceversion.yaml when#757
openshift-merge-bot[bot] merged 1 commit intoopenshift-service-mesh:mainfrom
FilipB:sync-upstream

Conversation

@FilipB
Copy link
Copy Markdown

@FilipB FilipB commented Mar 26, 2026

merging upstream changes.

We can't remove servicemeshoperator3.clusterserviceversion.yaml as it's embedded in bundle/bundle.go and mirror-licenses make target fails if it's missing

Breaking change was introduced in #721

@FilipB
Do not remove servicemeshoperator3.clusterserviceversion.yaml when
65f257b 
merging upstream changes.

We can't remove servicemeshoperator3.clusterserviceversion.yaml as it's embedded in bundle/bundle.go and mirror-licenses make target fails if it's missing

Breaking change was introduced in openshift-service-mesh#721

Signed-off-by: Filip Brychta <fbrychta@redhat.com>
@openshift-ci openshift-ci bot added the size/XS label Mar 26, 2026
@FilipB
Copy link
Copy Markdown
Author

FilipB commented Mar 26, 2026

/override ci/prow/ocp-4.20-e2e-ocp ci/prow/ocp-4.20-e2e-ocp-arm ci/prow/ocp-4.21-e2e-ocp ci/prow/ocp-4.20-gencheck ci/prow/ocp-4.20-e2e-ocp-unit

@openshift-ci
Copy link
Copy Markdown

openshift-ci bot commented Mar 26, 2026

@FilipB: /override requires failed status contexts, check run or a prowjob name to operate on.
The following unknown contexts/checkruns were given:

  • ci/prow/ocp-4.20-e2e-ocp-unit

Only the following failed contexts/checkruns were expected:

  • ci/prow/ocp-4.20-e2e-ocp
  • ci/prow/ocp-4.20-e2e-ocp-arm
  • ci/prow/ocp-4.20-gencheck
  • ci/prow/ocp-4.20-integration
  • ci/prow/ocp-4.20-lint
  • ci/prow/ocp-4.20-unit
  • ci/prow/ocp-4.21-e2e-ocp
  • pull-ci-openshift-service-mesh-sail-operator-main-ocp-4.20-e2e-ocp
  • pull-ci-openshift-service-mesh-sail-operator-main-ocp-4.20-e2e-ocp-arm
  • pull-ci-openshift-service-mesh-sail-operator-main-ocp-4.20-gencheck
  • pull-ci-openshift-service-mesh-sail-operator-main-ocp-4.20-integration
  • pull-ci-openshift-service-mesh-sail-operator-main-ocp-4.20-lint
  • pull-ci-openshift-service-mesh-sail-operator-main-ocp-4.20-unit
  • pull-ci-openshift-service-mesh-sail-operator-main-ocp-4.21-e2e-ocp

If you are trying to override a checkrun that has a space in it, you must put a double quote on the context.

Details

In response to this:

/override ci/prow/ocp-4.20-e2e-ocp ci/prow/ocp-4.20-e2e-ocp-arm ci/prow/ocp-4.21-e2e-ocp ci/prow/ocp-4.20-gencheck ci/prow/ocp-4.20-e2e-ocp-unit

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@FilipB
Copy link
Copy Markdown
Author

FilipB commented Mar 26, 2026

/override ci/prow/ocp-4.20-e2e-ocp ci/prow/ocp-4.20-e2e-ocp-arm ci/prow/ocp-4.21-e2e-ocp ci/prow/ocp-4.20-gencheck ci/prow/ocp-4.20-e2e-unit

@openshift-ci
Copy link
Copy Markdown

openshift-ci bot commented Mar 26, 2026

@FilipB: /override requires failed status contexts, check run or a prowjob name to operate on.
The following unknown contexts/checkruns were given:

  • ci/prow/ocp-4.20-e2e-unit

Only the following failed contexts/checkruns were expected:

  • ci/prow/ocp-4.20-e2e-ocp
  • ci/prow/ocp-4.20-e2e-ocp-arm
  • ci/prow/ocp-4.20-gencheck
  • ci/prow/ocp-4.20-integration
  • ci/prow/ocp-4.20-lint
  • ci/prow/ocp-4.20-unit
  • ci/prow/ocp-4.21-e2e-ocp
  • pull-ci-openshift-service-mesh-sail-operator-main-ocp-4.20-e2e-ocp
  • pull-ci-openshift-service-mesh-sail-operator-main-ocp-4.20-e2e-ocp-arm
  • pull-ci-openshift-service-mesh-sail-operator-main-ocp-4.20-gencheck
  • pull-ci-openshift-service-mesh-sail-operator-main-ocp-4.20-integration
  • pull-ci-openshift-service-mesh-sail-operator-main-ocp-4.20-lint
  • pull-ci-openshift-service-mesh-sail-operator-main-ocp-4.20-unit
  • pull-ci-openshift-service-mesh-sail-operator-main-ocp-4.21-e2e-ocp

If you are trying to override a checkrun that has a space in it, you must put a double quote on the context.

Details

In response to this:

/override ci/prow/ocp-4.20-e2e-ocp ci/prow/ocp-4.20-e2e-ocp-arm ci/prow/ocp-4.21-e2e-ocp ci/prow/ocp-4.20-gencheck ci/prow/ocp-4.20-e2e-unit

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@FilipB
Copy link
Copy Markdown
Author

FilipB commented Mar 26, 2026

/override ci/prow/ocp-4.20-e2e-ocp ci/prow/ocp-4.20-e2e-ocp-arm ci/prow/ocp-4.21-e2e-ocp ci/prow/ocp-4.20-gencheck ci/prow/ocp-4.20-unit

@openshift-ci
Copy link
Copy Markdown

openshift-ci bot commented Mar 26, 2026

@FilipB: Overrode contexts on behalf of FilipB: ci/prow/ocp-4.20-e2e-ocp, ci/prow/ocp-4.20-e2e-ocp-arm, ci/prow/ocp-4.20-gencheck, ci/prow/ocp-4.20-unit, ci/prow/ocp-4.21-e2e-ocp

Details

In response to this:

/override ci/prow/ocp-4.20-e2e-ocp ci/prow/ocp-4.20-e2e-ocp-arm ci/prow/ocp-4.21-e2e-ocp ci/prow/ocp-4.20-gencheck ci/prow/ocp-4.20-unit

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-merge-bot openshift-merge-bot bot merged commit 3a6bbe5 into openshift-service-mesh:main Mar 26, 2026
8 checks passed
@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented Mar 26, 2026

In response to a cherrypick label: #757 failed to apply on top of branch "release-3.3":

Applying: Do not remove servicemeshoperator3.clusterserviceversion.yaml when merging upstream changes.
Using index info to reconstruct a base tree...
M	ossm/merge_upstream.sh
Falling back to patching base and 3-way merge...
Auto-merging ossm/merge_upstream.sh
CONFLICT (content): Merge conflict in ossm/merge_upstream.sh
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Do not remove servicemeshoperator3.clusterserviceversion.yaml when merging upstream changes.

@FilipB FilipB deleted the sync-upstream branch March 26, 2026 13:28
openshift-merge-bot bot pushed a commit that referenced this pull request Mar 26, 2026
@FilipB
Do not remove servicemeshoperator3.clusterserviceversion.yaml when (#757
fcc149e 
) (#758)

merging upstream changes.

We can't remove servicemeshoperator3.clusterserviceversion.yaml as it's embedded in bundle/bundle.go and mirror-licenses make target fails if it's missing

Breaking change was introduced in #721

Signed-off-by: Filip Brychta <fbrychta@redhat.com>
hhovsepy pushed a commit to hhovsepy/sail-operator that referenced this pull request Apr 8, 2026
@nrfox
Add release and support strategy to README (openshift-service-mesh#757)
e493f1c 
Signed-off-by: Nick Fox <nfox@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nrfox nrfox nrfox approved these changes

Assignees

No one assigned

Labels

cherrypick/release-3.3 okay to merge size/XS

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@FilipB @openshift-cherrypick-robot @nrfox