Fix yaml;Fix volumemount;Fix filename
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
Danny Bessems 2022-08-30 18:11:02 +02:00
parent b34ac733f4
commit d8299ee90c
2 changed files with 7 additions and 8 deletions

View File

@ -30,18 +30,20 @@
kubernetes.core.k8s: kubernetes.core.k8s:
state: present state: present
template: secret.j2 template: secret.j2
kubeconfig: "{{ kubeconfig.path }}"
vars: vars:
_template: _template:
name: step-certificates-certs name: step-certificates-certs
namespace: "{{ item.namespace }}" namespace: "{{ item.namespace }}"
key: "{{ item.filename }}" key: "{{ item.filename }}"
value: "{{ stepca_cm_certs.resources[0].data['root_ca.crt'] | b64encode }}" value: "{{ stepca_cm_certs.resources[0].data['root_ca.crt'] | b64encode }}"
kubeconfig: "{{ kubeconfig.path }}"
loop: loop:
- namespace: argo-cd - namespace: argo-cd
filename: custom-ca-certificates.crt filename: custom-ca-certificates.crt
- namespace: kube-system - namespace: kube-system
filename: root_ca.crt filename: root_ca.crt
loop_control:
label: "{{ item.namespace }}"
- name: Configure step-ca passthrough ingress - name: Configure step-ca passthrough ingress
ansible.builtin.template: ansible.builtin.template:
@ -74,14 +76,11 @@
volumes: volumes:
- name: step-certificates-certs - name: step-certificates-certs
mountPath: /step-ca mountPath: /step-ca
type: configMap type: secret
env: env:
- name: LEGO_CA_CERTIFICATES - name: LEGO_CA_CERTIFICATES
value: /step-ca/root_ca.crt value: /step-ca/root_ca.crt
marker: ' # {mark} ANSIBLE MANAGED BLOCK' marker: ' # {mark} ANSIBLE MANAGED BLOCK'
# tags:
# - never
# - final
notify: notify:
- Apply manifests - Apply manifests

View File

@ -15,14 +15,14 @@
--insecure-policy \ --insecure-policy \
--dest-tls-verify=false \ --dest-tls-verify=false \
--dest-creds admin:{{ vapp['guestinfo.rootpw'] }} \ --dest-creds admin:{{ vapp['guestinfo.rootpw'] }} \
docker-archive:./{{ item }} \ docker-archive:./{{ item | basename }} \
docker://registry.{{ vapp['metacluster.fqdn'] }}/library/$( \ docker://registry.{{ vapp['metacluster.fqdn'] }}/library/$( \
skopeo list-tags \ skopeo list-tags \
--insecure-policy \ --insecure-policy \
docker-archive:./{{ item }} | \ docker-archive:./{{ item | basename }} | \
jq -r '.Tags[0]') jq -r '.Tags[0]')
chdir: /opt/metacluster/container-images/ chdir: /opt/metacluster/container-images/
loop: "{{ imagetarballs.files }}" with_fileglob: /opt/metacluster/container-images/*.tar
- name: Configure K3s node for private registry - name: Configure K3s node for private registry
ansible.builtin.template: ansible.builtin.template: