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

use a unique label for csi-addons resources #28

Merged
merged 1 commit into from
Feb 28, 2022

Conversation

Madhu-1
Copy link
Member

@Madhu-1 Madhu-1 commented Feb 28, 2022

csi-addon operator is using the default label and labelSelector provided by operator-sdk:control-plane:
controller-manager for its resources, this is a generic label and it can cause problems when multiple resources uses same labels changing the label to unique one.

Signed-off-by: Madhu Rajanna [email protected]

Notes:- This is from the upstream PR csi-addons#122 to downstream main branch to fix https://bugzilla.redhat.com/show_bug.cgi?id=2043034 will be backported once merged to release-4.10 branch

csi-addon operator is using the default label and
labelSelector provided by operator-sdk:control-plane:
controller-manager
for its resources, this is a generic label and it can
cause problems when multiple resources uses same labels
changing the label to unique one.

Signed-off-by: Madhu Rajanna <[email protected]>
@Madhu-1
Copy link
Member Author

Madhu-1 commented Feb 28, 2022

/assign @nixpanic

@Madhu-1
Copy link
Member Author

Madhu-1 commented Feb 28, 2022

/cherry-pick release-4.10

@openshift-cherrypick-robot

@Madhu-1: once the present PR merges, I will cherry-pick it on top of release-4.10 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.10

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.

@openshift-ci
Copy link

openshift-ci bot commented Feb 28, 2022

@Yuggupta27: changing LGTM is restricted to collaborators

In response to this:

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.

Copy link
Member

@Rakshith-R Rakshith-R left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci
Copy link

openshift-ci bot commented Feb 28, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Madhu-1, Rakshith-R, Yuggupta27

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

@openshift-merge-robot openshift-merge-robot merged commit 56fb920 into red-hat-storage:main Feb 28, 2022
@openshift-cherrypick-robot

@Madhu-1: #28 failed to apply on top of branch "release-4.10":

Applying: use a unique label for csi-addons resources
Using index info to reconstruct a base tree...
M	config/manager/manager.yaml
A	config/rbac/namespace.yaml
A	deploy/controller/rbac.yaml
A	deploy/controller/setup-controller.yaml
Falling back to patching base and 3-way merge...
Auto-merging vendor/sigs.k8s.io/kubebuilder/v3/pkg/cli/alpha/config-gen/templates/resources/namespace.template.yaml
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/kubebuilder/v3/pkg/cli/alpha/config-gen/templates/resources/namespace.template.yaml
CONFLICT (modify/delete): deploy/controller/setup-controller.yaml deleted in HEAD and modified in use a unique label for csi-addons resources. Version use a unique label for csi-addons resources of deploy/controller/setup-controller.yaml left in tree.
CONFLICT (modify/delete): deploy/controller/rbac.yaml deleted in HEAD and modified in use a unique label for csi-addons resources. Version use a unique label for csi-addons resources of deploy/controller/rbac.yaml left in tree.
Auto-merging config/manager/manager.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 use a unique label for csi-addons resources
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-4.10

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.

openshift-merge-robot pushed a commit that referenced this pull request Feb 28, 2022
csi-addon operator is using the default label and
labelSelector provided by operator-sdk:control-plane:
controller-manager
for its resources, this is a generic label and it can
cause problems when multiple resources uses same labels
changing the label to unique one.

backport of #28

Signed-off-by: Madhu Rajanna <[email protected]>
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.

6 participants