Closed gazarenkov closed 5 months ago
⚠️ Files changed in bundle generation!
Those changes to the operator bundle manifests should have been pushed automatically to your PR branch.
You might also need to manually update the .rhdh/bundle/manifests/rhdh-operator.csv.yaml
CSV file accordingly.
/cherry-pick 1.2.x
@gazarenkov: once the present PR merges, I will cherry-pick it on top of 1.2.x in a new PR and assign it to you.
Issues
0 New issues
0 Accepted issues
Measures
0 Security Hotspots
No data about Coverage
0.5% Duplication on New Code
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: rm3l
The full list of commands accepted by this bot can be found here.
The pull request process is described here
@gazarenkov: #371 failed to apply on top of branch "1.2.x":
Applying: headless service for statefulset
Applying: Regenerate bundle manifests
Applying: add test for serviceName
Using index info to reconstruct a base tree...
M bundle/manifests/backstage-default-config_v1_configmap.yaml
M bundle/manifests/backstage-operator.clusterserviceversion.yaml
Falling back to patching base and 3-way merge...
Auto-merging bundle/manifests/backstage-operator.clusterserviceversion.yaml
CONFLICT (content): Merge conflict in bundle/manifests/backstage-operator.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 0003 add test for serviceName
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".
Description
I mostly addressed #370 as commented
Which issue(s) does this PR fix or relate to
https://github.com/janus-idp/operator/issues/370
PR acceptance criteria