Closed mergify[bot] closed 2 months ago
Cherry-pick of 25de979ad44ba6a47e15bdf13a5035e0555eb2b0 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
/build_test
/build_test
completed successfully ✅.
View Actions Run.
Welcome to Cryostat! 👋
Before contributing, make sure you have:
main
branch[chore, ci, docs, feat, fix, test]
git commit -S -m "YOUR_COMMIT_MESSAGE"
Fixes: #924
Description of the change:
app.kubernetes.io/name
label to all operator objects usingcommonLabels
Kustomize propertycert
volume and mount from bundle manifests, which is unneeded when run as a bundleMotivation for the change:
How to manually test:
This is an automatic backport of pull request #926 done by Mergify.