You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
#1775 failed to apply on top of branch "stable/2023.1":
Applying: Initial round of node-tls-sidecar
Applying: Fix image name
Applying: Added pod-tls-sidecar for node-exporter
Using index info to reconstruct a base tree...
M roles/kube_prometheus_stack/defaults/main.yml
M roles/kube_prometheus_stack/vars/main.yml
Falling back to patching base and 3-way merge...
Auto-merging roles/kube_prometheus_stack/vars/main.yml
Auto-merging roles/kube_prometheus_stack/defaults/main.yml
Applying: The art of escaping Helm and Ansible
Applying: Fix configmap mount
Applying: Dance around Helm
Applying: Fix volume mount
Applying: Mount service token
Applying: Added RBAC
Applying: Fix role binding name
Applying: Switch node exporter to use TLS
Applying: Fix mount
Applying: Switch to VerifyClientCertIfGiven
Applying: Refactor to host certs
Using index info to reconstruct a base tree...
M roles/kube_prometheus_stack/defaults/main.yml
M roles/kube_prometheus_stack/vars/main.yml
Falling back to patching base and 3-way merge...
Auto-merging roles/kube_prometheus_stack/vars/main.yml
Auto-merging roles/kube_prometheus_stack/defaults/main.yml
CONFLICT (content): Merge conflict in roles/kube_prometheus_stack/defaults/main.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0014 Refactor to host certs
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 text was updated successfully, but these errors were encountered:
Manual cherrypick required.
#1775 failed to apply on top of branch "stable/2023.1":
The text was updated successfully, but these errors were encountered: