diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2022-01-01 20:19:56 +0100 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2022-01-01 20:19:56 +0100 |
| commit | d90144d2190009f8bd121cb8f773a9209500f034 (patch) | |
| tree | 2d258279d2179afc58fd91c741e0b5fa56246c9f /roles/kubernetes | |
| parent | Merge branch 'topic/revamp-openwrt-imag-gen' (diff) | |
in-place variable cooking
Diffstat (limited to 'roles/kubernetes')
| -rw-r--r-- | roles/kubernetes/kubeadm/base/templates/net_kubeguard/peer.service.j2 | 2 | ||||
| -rw-r--r-- | roles/kubernetes/kubeadm/master/templates/encryption-config.j2 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/kubernetes/kubeadm/base/templates/net_kubeguard/peer.service.j2 b/roles/kubernetes/kubeadm/base/templates/net_kubeguard/peer.service.j2 index c9d96a5a..a119dd0d 100644 --- a/roles/kubernetes/kubeadm/base/templates/net_kubeguard/peer.service.j2 +++ b/roles/kubernetes/kubeadm/base/templates/net_kubeguard/peer.service.j2 @@ -14,7 +14,7 @@ After=kubeguard-interface.service {% else %} {% set tun_ip = kubernetes.pod_ip_range | ipsubnet(kubernetes.pod_ip_range_size, 0) | ipaddr(kubeguard.node_index[peer]) -%} {% set wg_pubkey = hostvars[peer].kubeguard_wireguard_pubkey.stdout -%} -{% set wg_host = hostvars[peer].external_ip_cooked | default(hostvars[peer].ansible_default_ipv4.address) -%} +{% set wg_host = hostvars[peer].external_ip | default(hostvars[peer].ansible_default_ipv4.address) -%} {% set wg_port = hostvars[peer].kubeguard_wireguard_port | default(51820) -%} {% set wg_allowedips = (tun_ip | ipaddr('address')) + "/32," + pod_net_peer %} {% endif %} diff --git a/roles/kubernetes/kubeadm/master/templates/encryption-config.j2 b/roles/kubernetes/kubeadm/master/templates/encryption-config.j2 index b0e700b2..345c9bf9 100644 --- a/roles/kubernetes/kubeadm/master/templates/encryption-config.j2 +++ b/roles/kubernetes/kubeadm/master/templates/encryption-config.j2 @@ -6,7 +6,7 @@ resources: providers: - secretbox: keys: -{% for key in kubernetes_secrets_cooked.encryption_config_keys %} +{% for key in kubernetes_secrets.encryption_config_keys %} - name: key{{ loop.index }} secret: {{ key }} {% endfor %} |