From 46f722e50fc7b48b316591fe2f986526cc5a051d Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Tue, 6 Sep 2022 02:29:49 +0200
Subject: replace ipsubnet() filter to new path

---
 .../kubernetes/kubeadm/base/templates/net_kubeguard/cni.conflist.j2 | 2 +-
 .../kubernetes/kubeadm/base/templates/net_kubeguard/ifupdown.sh.j2  | 4 ++--
 .../kubernetes/kubeadm/base/templates/net_kubeguard/peer.service.j2 | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'roles/kubernetes')

diff --git a/roles/kubernetes/kubeadm/base/templates/net_kubeguard/cni.conflist.j2 b/roles/kubernetes/kubeadm/base/templates/net_kubeguard/cni.conflist.j2
index 240d86ef..6aa438ca 100644
--- a/roles/kubernetes/kubeadm/base/templates/net_kubeguard/cni.conflist.j2
+++ b/roles/kubernetes/kubeadm/base/templates/net_kubeguard/cni.conflist.j2
@@ -9,7 +9,7 @@
       "hairpinMode": true,
       "ipam": {
         "type": "host-local",
-        "subnet": "{{ kubernetes.pod_ip_range | ipsubnet(kubernetes.pod_ip_range_size, kubeguard.node_index[inventory_hostname]) }}"
+        "subnet": "{{ kubernetes.pod_ip_range | ansible.utils.ipsubnet(kubernetes.pod_ip_range_size, kubeguard.node_index[inventory_hostname]) }}"
       }
     }
   ]
diff --git a/roles/kubernetes/kubeadm/base/templates/net_kubeguard/ifupdown.sh.j2 b/roles/kubernetes/kubeadm/base/templates/net_kubeguard/ifupdown.sh.j2
index 7ac72871..8f3b5c76 100644
--- a/roles/kubernetes/kubeadm/base/templates/net_kubeguard/ifupdown.sh.j2
+++ b/roles/kubernetes/kubeadm/base/templates/net_kubeguard/ifupdown.sh.j2
@@ -8,14 +8,14 @@ INET_IF="{{ ansible_default_ipv4.interface }}"
 
 POD_NET_CIDR="{{ kubernetes.pod_ip_range }}"
 
-{% set br_net = kubernetes.pod_ip_range | ipsubnet(kubernetes.pod_ip_range_size, kubeguard.node_index[inventory_hostname]) -%}
+{% set br_net = kubernetes.pod_ip_range | ansible.utils.ipsubnet(kubernetes.pod_ip_range_size, kubeguard.node_index[inventory_hostname]) -%}
 BR_IF="kubeguard-br0"
 BR_IP="{{ br_net | ansible.utils.ipaddr(1) | ansible.utils.ipaddr('address')  }}"
 BR_IP_CIDR="{{ br_net | ansible.utils.ipaddr(1) }}"
 BR_NET_CIDR="{{ br_net }}"
 
 TUN_IF="kubeguard-wg0"
-TUN_IP_CIDR="{{ kubernetes.pod_ip_range | ipsubnet(kubernetes.pod_ip_range_size, 0) | ansible.utils.ipaddr(kubeguard.node_index[inventory_hostname]) }}"
+TUN_IP_CIDR="{{ kubernetes.pod_ip_range | ansible.utils.ipsubnet(kubernetes.pod_ip_range_size, 0) | ansible.utils.ipaddr(kubeguard.node_index[inventory_hostname]) }}"
 
 
 case "$1" in
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 745a5b31..426f84a5 100644
--- a/roles/kubernetes/kubeadm/base/templates/net_kubeguard/peer.service.j2
+++ b/roles/kubernetes/kubeadm/base/templates/net_kubeguard/peer.service.j2
@@ -4,15 +4,15 @@ After=network.target
 Requires=kubeguard-interface.service
 After=kubeguard-interface.service
 
-{% set pod_ip_self = kubernetes.pod_ip_range | ipsubnet(kubernetes.pod_ip_range_size, kubeguard.node_index[inventory_hostname]) | ansible.utils.ipaddr(1) | ansible.utils.ipaddr('address') -%}
-{% set pod_net_peer = kubernetes.pod_ip_range | ipsubnet(kubernetes.pod_ip_range_size, kubeguard.node_index[peer]) -%}
+{% set pod_ip_self = kubernetes.pod_ip_range | ansible.utils.ipsubnet(kubernetes.pod_ip_range_size, kubeguard.node_index[inventory_hostname]) | ansible.utils.ipaddr(1) | ansible.utils.ipaddr('address') -%}
+{% set pod_net_peer = kubernetes.pod_ip_range | ansible.utils.ipsubnet(kubernetes.pod_ip_range_size, kubeguard.node_index[peer]) -%}
 {% set direct_zone = kubeguard.direct_net_zones | default({}) | kubeguard_direct_net_zone(inventory_hostname, peer) -%}
 {% if direct_zone %}
 {% set direct_ip = kubeguard.direct_net_zones[direct_zone].transfer_net | ansible.utils.ipaddr(kubeguard.node_index[inventory_hostname]) %}
 {% set direct_interface = kubeguard.direct_net_zones[direct_zone].node_interface[inventory_hostname] %}
 {% set direct_ip_peer = kubeguard.direct_net_zones[direct_zone].transfer_net | ansible.utils.ipaddr(kubeguard.node_index[peer]) %}
 {% else %}
-{% set tun_ip = kubernetes.pod_ip_range | ipsubnet(kubernetes.pod_ip_range_size, 0) | ansible.utils.ipaddr(kubeguard.node_index[peer]) -%}
+{% set tun_ip = kubernetes.pod_ip_range | ansible.utils.ipsubnet(kubernetes.pod_ip_range_size, 0) | ansible.utils.ipaddr(kubeguard.node_index[peer]) -%}
 {% set wg_pubkey = hostvars[peer].kubeguard_wireguard_pubkey.stdout -%}
 {% set wg_host = hostvars[peer].external_ip | default(hostvars[peer].ansible_default_ipv4.address) -%}
 {% set wg_port = hostvars[peer].kubeguard_wireguard_port | default(51820) -%}
-- 
cgit v1.2.3