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

fix(webhook): make label selectors unambiguous (backport #926) #927

Merged
merged 2 commits into from
Jul 31, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 31, 2024

Welcome to Cryostat! 👋

Before contributing, make sure you have:

  • Read the contributing guidelines
  • Linked a relevant issue which this PR resolves
  • Linked any other relevant issues, PR's, or documentation, if any
  • Resolved all conflicts, if any
  • Rebased your branch PR on top of the latest upstream main branch
  • Attached at least one of the following labels to the PR: [chore, ci, docs, feat, fix, test]
  • Signed all commits: git commit -S -m "YOUR_COMMIT_MESSAGE"

Fixes: #924

Description of the change:

  • Adds app.kubernetes.io/name label to all operator objects using commonLabels Kustomize property
  • Cleanup: uncomments patch to remove cert volume and mount from bundle manifests, which is unneeded when run as a bundle

Motivation for the change:

  • Fixes a bug where webhook requests may be sent to other operators in the same namespace

How to manually test:

  1. Install another operator with a webhook (e.g. Infinispan Operator)
  2. Deploy this PR into the same namespace
  3. Exercise webhooks by creating and modifying Cryostat CRs

This is an automatic backport of pull request #926 done by [Mergify](https://mergify.com).

(cherry picked from commit 25de979)

# Conflicts:
#	bundle/manifests/cryostat-operator.clusterserviceversion.yaml
@mergify mergify bot added the conflicts label Jul 31, 2024
@mergify mergify bot assigned ebaron Jul 31, 2024
Copy link
Contributor Author

mergify bot commented Jul 31, 2024

Cherry-pick of 25de979 has failed:

On branch mergify/bp/cryostat-v3.0/pr-926
Your branch is up to date with 'origin/cryostat-v3.0'.

You are currently cherry-picking commit 25de979.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   bundle/manifests/cryostat-operator-cryostat-namespaced_rbac.authorization.k8s.io_v1_clusterrole.yaml
	modified:   bundle/manifests/cryostat-operator-cryostat_rbac.authorization.k8s.io_v1_clusterrole.yaml
	modified:   bundle/manifests/cryostat-operator-manager-config_v1_configmap.yaml
	modified:   bundle/manifests/cryostat-operator-oauth-client_rbac.authorization.k8s.io_v1_clusterrole.yaml
	modified:   bundle/manifests/cryostat-operator-webhook-service_v1_service.yaml
	modified:   bundle/manifests/operator.cryostat.io_cryostats.yaml
	modified:   config/default/kustomization.yaml
	modified:   config/manifests/kustomization.yaml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   bundle/manifests/cryostat-operator.clusterserviceversion.yaml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@ebaron
Copy link
Member

ebaron commented Jul 31, 2024

/build_test

@ebaron ebaron added fix and removed conflicts labels Jul 31, 2024
Copy link

/build_test completed successfully ✅.
View Actions Run.

@ebaron ebaron merged commit c17fe4c into cryostat-v3.0 Jul 31, 2024
7 checks passed
@mergify mergify bot deleted the mergify/bp/cryostat-v3.0/pr-926 branch July 31, 2024 14:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant