From 949ff8a513464f107ebd2c474078b452e129acf3 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sat, 11 Jan 2020 01:35:42 +0100 Subject: kubernetes: major refactoring of kubernetes playbook structure --- inventory/group_vars/k8s-test/main.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'inventory/group_vars/k8s-test/main.yml') diff --git a/inventory/group_vars/k8s-test/main.yml b/inventory/group_vars/k8s-test/main.yml index a28cba9c..7e01d0ab 100644 --- a/inventory/group_vars/k8s-test/main.yml +++ b/inventory/group_vars/k8s-test/main.yml @@ -8,26 +8,25 @@ kubernetes: container_runtime: containerd network_plugin: kubeguard - dedicated_master: True - api_advertise_ip: 144.76.160.141 + dedicated_master: False + api_advertise_ip: 89.106.215.23 api_extra_sans: - - k8s-test.chaos-at-home.org + - k8s-test.spreadspace.org pod_ip_range: 172.18.0.0/16 pod_ip_range_size: 24 service_ip_range: 172.18.192.0/18 - kubeguard: kube_router_version: 0.4.0-rc1 - ## host_index must be in the range between 1 and 190 -> 189 hosts possible + ## node_index must be in the range between 1 and 190 -> 189 hosts possible ## ## hardcoded hostnames are not nice but if we do this via host_vars ## the info is spread over multiple files and this makes it more diffcult ## to find mistakes, so it is nicer to keep it in one place... - host_index: + node_index: s2-k8s-test0: 1 s2-k8s-test1: 2 s2-k8s-test2: 3 @@ -40,3 +39,7 @@ kubeguard: node_interface: s2-k8s-test0: direct0 s2-k8s-test1: direct0 + + +kubernetes_kubelet_node_ip: "{{ kubernetes.pod_ip_range | ipsubnet(kubernetes.pod_ip_range_size, kubeguard.node_index[inventory_hostname]) | ipaddr(1) | ipaddr('address') }}" +kubernetes_cri_socket: "unix:///run/containerd/containerd.sock" -- cgit v1.2.3