diff options
Diffstat (limited to 'inventory/group_vars')
| -rw-r--r-- | inventory/group_vars/elevate-festival/main.yml | 1 | ||||
| -rw-r--r-- | inventory/group_vars/k8s-emc/main.yml | 24 |
2 files changed, 13 insertions, 12 deletions
diff --git a/inventory/group_vars/elevate-festival/main.yml b/inventory/group_vars/elevate-festival/main.yml index d721946e..87da2237 100644 --- a/inventory/group_vars/elevate-festival/main.yml +++ b/inventory/group_vars/elevate-festival/main.yml @@ -13,7 +13,6 @@ network_zones: ele-media: 200 ele-telesto: 201 ele-thetys: 202 - # TODO: move this emc zone ele-dione: 210 ele-helene: 211 # TODO: move this to mgmt zone diff --git a/inventory/group_vars/k8s-emc/main.yml b/inventory/group_vars/k8s-emc/main.yml index b7c52b09..d9bf350e 100644 --- a/inventory/group_vars/k8s-emc/main.yml +++ b/inventory/group_vars/k8s-emc/main.yml @@ -1,30 +1,31 @@ --- docker_pkg_provider: docker-com docker_pkg_name: docker-ce -docker_pkg_version: 18.06.1~ce~3-0~debian -kubernetes_version: 1.13.2 +kubernetes_version: 1.17.2 +kubernetes_container_runtime: docker +kubernetes_network_plugin: kubeguard kubernetes: cluster_name: emc - version: "{{ kubernetes_version }}" - pkg_version: "{{ kubernetes_version }}-00" - - dedicated_master: True - api_advertise_ip: 144.76.160.141 + dedicated_master: False api_extra_sans: - - emc-master.spreadspace.org + - 178.63.180.137 + - emc-master.elev8.at pod_ip_range: 172.18.0.0/16 pod_ip_range_size: 24 service_ip_range: 172.18.192.0/18 - ## net_index must be in the range between 1 and 190 -> 189 hosts possible + + +kubeguard: + ## 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... - net_index: + node_index: emc-01: 1 emc-02: 2 emc-03: 3 @@ -35,7 +36,6 @@ kubernetes: emc-dist0: 110 ele-dione: 111 ele-helene: 112 - emc-stats: 120 emc-master: 127 direct_net_zones: @@ -44,3 +44,5 @@ kubernetes: node_interface: ele-dione: eno2 ele-helene: eno2 + +kubernetes_overlay_node_ip: "{{ kubernetes.pod_ip_range | ipsubnet(kubernetes.pod_ip_range_size, kubeguard.node_index[inventory_hostname]) | ipaddr(1) | ipaddr('address') }}" |