Skip to content
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.

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

Rename controller-manager to controller #883

Conversation

qbarrand
Copy link
Contributor

Because this changes the deployment name in the CSV, it should allow for OLM upgrades despite the change in label selectors.

Fixes #882

/cc @yevgeny-shnaidman @ybettan

Copy link

netlify bot commented Nov 15, 2023

Deploy Preview for openshift-kmm ready!

Name Link
🔨 Latest commit b71324e
🔍 Latest deploy log https://app.netlify.com/sites/openshift-kmm/deploys/6554ea1758334b000885e9e1
😎 Deploy Preview https://deploy-preview-883--openshift-kmm.netlify.app/
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

Copy link

openshift-ci bot commented Nov 15, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: qbarrand

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Because this changes the deployment name in the CSV, it should allow for
OLM upgrades despite the change in label selectors.

Upstream-Commit: b156020
@qbarrand
Copy link
Contributor Author

/retest

Copy link

openshift-ci bot commented Nov 15, 2023

@qbarrand: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/security b71324e link false /test security

Full PR test history. Your PR dashboard.

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/test-infra repository. I understand the commands that are listed here.

@yevgeny-shnaidman
Copy link
Member

/lgtm

@openshift-ci openshift-ci bot added the lgtm label Nov 16, 2023
@openshift-merge-bot openshift-merge-bot bot merged commit 3318a85 into rh-ecosystem-edge:main Nov 16, 2023
5 checks passed
@qbarrand qbarrand deleted the cp-b15602070968a89afa113190d095b574af9b5b5a branch November 16, 2023 07:22
@qbarrand
Copy link
Contributor Author

/cherry-pick release-2.0

@openshift-cherrypick-robot

@qbarrand: #883 failed to apply on top of branch "release-2.0":

Applying: Rename controller-manager to controller
Using index info to reconstruct a base tree...
M	bundle-hub/manifests/kernel-module-management-hub.clusterserviceversion.yaml
M	bundle/manifests/kernel-module-management.clusterserviceversion.yaml
M	config/manager-base/manager.yaml
A	docs/mkdocs/labsv2.md
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): docs/mkdocs/labsv2.md deleted in HEAD and modified in Rename controller-manager to controller. Version Rename controller-manager to controller of docs/mkdocs/labsv2.md left in tree.
Auto-merging config/manager-base/manager.yaml
Auto-merging bundle/manifests/kernel-module-management.clusterserviceversion.yaml
Auto-merging bundle-hub/manifests/kernel-module-management-hub.clusterserviceversion.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Rename controller-manager to controller
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-2.0

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/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Cherry-picking error for b15602070968a89afa113190d095b574af9b5b5a
3 participants