k8s: rename masters to control-plane nodes

4 files changed, 9 insertions, 11 deletions

diff --git a/inventory/group_vars/chaos-at-home/network.yml b/inventory/group_vars/chaos-at-home/network.yml
index 2957a24a..46564977 100644
--- a/inventory/group_vars/chaos-at-home/network.yml
+++ b/inventory/group_vars/chaos-at-home/network.yml
@@ -68,7 +68,7 @@ network_zones:
       ch-http-proxy: 8
       ch-imap-proxy: 9
       ch-vpn: 10
-      ch-k8s-master: 20
+      ch-k8s-ctrl: 20
       ch-jump: 22
       ch-gw-lan: 28
       ch-iot: 30
diff --git a/inventory/group_vars/k8s-chtest/vars.yml b/inventory/group_vars/k8s-chtest/vars.yml
index e01b996d..66824314 100644
--- a/inventory/group_vars/k8s-chtest/vars.yml
+++ b/inventory/group_vars/k8s-chtest/vars.yml
@@ -1,15 +1,15 @@
 ---
-kubernetes_version: 1.23.1
+kubernetes_version: 1.23.6
 kubernetes_container_runtime: containerd
 kubernetes_network_plugin: kube-router
 kubernetes_network_plugin_version: 1.4.0
-kubernetes_network_plugin_replaces_kube_proxy: true
+kubernetes_network_plugin_replaces_kube_proxy: yes
 
 
 kubernetes:
   cluster_name: chtest
 
-  dedicated_master: True
+  dedicated_controlplane_nodes: yes
   api_extra_sans:
   - 192.168.32.20
 
diff --git a/inventory/group_vars/k8s-emc/vars.yml b/inventory/group_vars/k8s-emc/vars.yml
index c13e610c..b2a8fe39 100644
--- a/inventory/group_vars/k8s-emc/vars.yml
+++ b/inventory/group_vars/k8s-emc/vars.yml
@@ -6,10 +6,10 @@ kubernetes_network_plugin: kubeguard
 kubernetes:
   cluster_name: emc
 
-  dedicated_master: False
+  dedicated_controlplane_nodes: yes
   api_extra_sans:
   - 178.63.180.137
-  - emc-master.elev8.at
+  - emc-ctrl.elev8.at
 
   pod_ip_range: 172.18.0.0/16
   pod_ip_range_size: 24
@@ -37,7 +37,7 @@ kubeguard:
     emc-dist0: 110
     ele-dione: 111
     ele-helene: 112
-    emc-master: 127
+    emc-ctrl: 127
 
   direct_net_zones:
     encoder:
diff --git a/inventory/group_vars/vmhost-sk-2019vm/vars.yml b/inventory/group_vars/vmhost-sk-2019vm/vars.yml
index 221fa581..41f8b9db 100644
--- a/inventory/group_vars/vmhost-sk-2019vm/vars.yml
+++ b/inventory/group_vars/vmhost-sk-2019vm/vars.yml
@@ -11,8 +11,7 @@ vm_host:
         prefix: 192.168.250.0/24
         offsets:
           sk-torrent: 136
-          emc-master: 137
-#          lw-master: 137
+          emc-ctrl: 137
           ele-gwhetzner: 138
           sgg-icecast: 141
           ch-mimas: 142
@@ -24,8 +23,7 @@ vm_host:
             prefix: 178.63.180.136/29
             offsets:
               sk-torrent: 0
-              emc-master: 1
-#              lw-master: 1
+              emc-ctrl: 1
               ele-gwhetzner: 2
               sgg-icecast: 5
               ch-mimas: 6