djpbessems/Packer.Images
djpbessems/Packer.Images
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Incorrect linebreak in ca-bundle

Browse Source
This commit is contained in:
Danny Bessems 2023-08-24 10:04:38 +02:00
parent ac5d3e3668
commit 87e89cfa27
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/roles/firstboot/files/ansible_payload/bootstrap/roles/workloadcluster/tasks/gitops.yml
View File

@ -34,6 +34,7 @@
vars: vars:
manifest: "{{ item.0 }}" manifest: "{{ item.0 }}"
src: "{{ item.1.src }}" src: "{{ item.1.src }}"
_newline: "\n"
_template: "{{ item.1._template }}" _template: "{{ item.1._template }}"
loop: "{{ query('ansible.builtin.subelements', query('ansible.builtin.dict', downstream_components), 'value.extra_manifests') }}" loop: "{{ query('ansible.builtin.subelements', query('ansible.builtin.dict', downstream_components), 'value.extra_manifests') }}"
loop_control: loop_control:

2
ansible/vars/workloadcluster.yml
View File

@ -36,7 +36,7 @@ downstream:
issuer: https://auth.{{ vapp['metacluster.fqdn'] }}/sso issuer: https://auth.{{ vapp['metacluster.fqdn'] }}/sso
audience: "{{ vapp['workloadcluster.name'] | lower }}" audience: "{{ vapp['workloadcluster.name'] | lower }}"
tls: tls:
certificateAuthorityData: "{{ (stepca_cm_certs.resources[0].data['intermediate_ca.crt'] ~ '\n' ~ stepca_cm_certs.resources[0].data['root_ca.crt']) | b64encode }}" certificateAuthorityData: "{{ (stepca_cm_certs.resources[0].data['intermediate_ca.crt'] ~ _newline ~ stepca_cm_certs.resources[0].data['root_ca.crt']) | b64encode }}"
sealed-secrets: sealed-secrets:
version: 2.8.1 # (= Sealed Secrets v0.20.2) version: 2.8.1 # (= Sealed Secrets v0.20.2)