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

fix: Inject line break in ca-bundle through variable
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Danny Bessems 2023-08-23 17:17:54 +02:00
parent 17ad64013a
commit 2c5e8e10b5
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ansible/roles/firstboot/files/ansible_payload/bootstrap/roles/metacluster/tasks/authentication.yml
View File

@ -109,6 +109,7 @@
state: present state: present
kubeconfig: "{{ kubeconfig.path }}" kubeconfig: "{{ kubeconfig.path }}"
vars: vars:
_newline: "\n"
_template: _template:
name: "{{ item.name }}" name: "{{ item.name }}"
namespace: "{{ item.namespace }}" namespace: "{{ item.namespace }}"
@ -122,7 +123,7 @@
spec: |2 spec: |2
issuer: https://idps.{{ vapp['metacluster.fqdn'] }} issuer: https://idps.{{ vapp['metacluster.fqdn'] }}
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 }}"
authorizationConfig: authorizationConfig:
additionalScopes: [offline_access, groups, email] additionalScopes: [offline_access, groups, email]
allowPasswordGrant: false allowPasswordGrant: false

2
ansible/vars/workloadcluster.yml
View File

@ -34,7 +34,7 @@ downstream:
name: metacluster-sso name: metacluster-sso
spec: !unsafe |2 spec: !unsafe |2
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'] ~ '\n' ~ stepca_cm_certs.resources[0].data['root_ca.crt']) | b64encode }}"