Closed mergify[bot] closed 2 months ago
Cherry-pick of 07403b02e51e68f56935ffabccff76ef1c011ac2 has failed:
On branch mergify/bp/cryostat-v3.0/pr-943
Your branch is up to date with 'origin/cryostat-v3.0'.
You are currently cherry-picking commit 07403b0.
(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: Makefile
modified: config/default/image_pull_patch.yaml
modified: config/default/image_tag_patch.yaml
modified: config/default/manager_auth_proxy_patch.yaml
modified: config/default/manager_config_patch.yaml
modified: config/default/manager_webhook_patch.yaml
modified: config/insights/insights_patch.yaml
modified: config/manager/kustomization.yaml
modified: config/manager/manager.yaml
modified: config/manifests/kustomization.yaml
modified: hack/image_pull_patch.yaml.in
modified: hack/image_tag_patch.yaml.in
modified: hack/insights_patch.yaml.in
modified: internal/controllers/common/resource_definitions/resource_definitions.go
modified: internal/controllers/constants/constants.go
modified: internal/controllers/reconciler_test.go
modified: internal/test/scorecard/common_utils.go
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
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: #942
Description of the change:
cryostat-operator-controller-manager
tocryostat-operator-controller
Motivation for the change:
How to manually test:
make deploy_bundle BUNDLE_IMG=quay.io/cryostat/cryostat-operator-bundle:3.0.0
./bin/operator-sdk run bundle-upgrade quay.io/ebaron/cryostat-operator-bundle:rename-deployment-01
This is an automatic backport of pull request #943 done by Mergify.