Closed vakwetu closed 3 months ago
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: slagle, vakwetu
The full list of commands accepted by this bot can be found here.
The pull request process is described here
/retest
/cherry-pick 18.0.0-proposed
@stuggi: #992 failed to apply on top of branch "18.0.0-proposed":
Applying: Add watcher for cert changes
Using index info to reconstruct a base tree...
M controllers/dataplane/openstackdataplanedeployment_controller.go
M tests/functional/dataplane/suite_test.go
Falling back to patching base and 3-way merge...
Auto-merging tests/functional/dataplane/suite_test.go
Auto-merging controllers/dataplane/openstackdataplanedeployment_controller.go
CONFLICT (content): Merge conflict in controllers/dataplane/openstackdataplanedeployment_controller.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add watcher for cert changes
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".
The deployment manages certs and needs to watch them for changes during the initial deployment.
Jira: OSPRH-9089