Fix var reference;Fix port;Merge chart values
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
Danny Bessems 2023-01-29 19:02:06 +01:00
parent e3ce60bcb4
commit 95f5750291
2 changed files with 9 additions and 3 deletions

View File

@ -9,7 +9,13 @@
# Unable to use REST api based readycheck due to 'missing' ingress # Unable to use REST api based readycheck due to 'missing' ingress
wait: yes wait: yes
kubeconfig: "{{ kubeconfig.path }}" kubeconfig: "{{ kubeconfig.path }}"
values: "{{ stepca_values.stdout }}" values: "{{ ( stepca_values.stdout | from_yaml ) | combine( { 'inject': ( _template.chart_values | from_yaml ) }, recursive=True ) }}"
vars:
_template:
chart_values: >-
secrets:
ca_password: "{{ vapp['metacluster.password'] }}"
provisioner_password: "{{ vapp['metacluster.password'] }}"
- name: Retrieve configmap w/ root certificate - name: Retrieve configmap w/ root certificate
kubernetes.core.k8s_info: kubernetes.core.k8s_info:

View File

@ -33,11 +33,11 @@
--dns=ca.{{ vapp['metacluster.fqdn'] }} \ --dns=ca.{{ vapp['metacluster.fqdn'] }} \
--dns=step-certificates.step-ca.svc.cluster.local \ --dns=step-certificates.step-ca.svc.cluster.local \
--dns=127.0.0.1 \ --dns=127.0.0.1 \
--address=:443 \ --address=:9000 \
--provisioner=admin \ --provisioner=admin \
--acme \ --acme \
--password-file={{ stepca_password.path }} --password-file={{ stepca_password.path }}
register: stepca_helmvalues register: stepca_values
- name: Cleanup tempfile - name: Cleanup tempfile
ansible.builtin.file: ansible.builtin.file: