Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable/2023.1] Add TLS to node exporter #1777

Closed
vexxhost-bot opened this issue Aug 12, 2024 · 0 comments
Closed

[stable/2023.1] Add TLS to node exporter #1777

vexxhost-bot opened this issue Aug 12, 2024 · 0 comments
Assignees

Comments

@vexxhost-bot
Copy link
Collaborator

Manual cherrypick required.

#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".

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants