From 48f5204608f83308ff1de966be8b5400a310a4f6 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Thu, 13 Jan 2022 20:42:35 +0100 Subject: kubeadm: fixes for 1.23 --- inventory/group_vars/k8s-chtest/vars.yml | 52 ++++++++++++++++---------------- 1 file changed, 26 insertions(+), 26 deletions(-) (limited to 'inventory/group_vars') diff --git a/inventory/group_vars/k8s-chtest/vars.yml b/inventory/group_vars/k8s-chtest/vars.yml index 93678de5..578a3371 100644 --- a/inventory/group_vars/k8s-chtest/vars.yml +++ b/inventory/group_vars/k8s-chtest/vars.yml @@ -1,12 +1,12 @@ --- -docker_pkg_provider: docker-com - -kubernetes_version: 1.22.5 -kubernetes_container_runtime: docker -kubernetes_network_plugin: kubeguard +kubernetes_version: 1.23.1 +kubernetes_cri_tools_pkg_version: 1.22.0-1 +kubernetes_container_runtime: containerd +# kubernetes_network_plugin: kubeguard # kubernetes_network_plugin_variant: with-kube-router -# kubernetes_network_plugin_version: 0.4.0 -# kubernetes_network_plugin_replaces_kube_proxy: true +kubernetes_network_plugin: kube-router +kubernetes_network_plugin_version: 0.4.0 +kubernetes_network_plugin_replaces_kube_proxy: true kubernetes: @@ -25,24 +25,24 @@ kubernetes_secrets: encryption_config_keys: "{{ vault_kubernetes_encryption_config_keys }}" -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... - node_index: - ch-dione: 111 - ch-helene: 112 - ch-k8s-master: 127 - - direct_net_zones: - encoder: - transfer_net: 172.18.191.0/24 - node_interface: - ch-dione: eno2 - ch-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') }}" +# 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... +# node_index: +# ch-dione: 111 +# ch-helene: 112 +# ch-k8s-master: 127 + +# direct_net_zones: +# encoder: +# transfer_net: 172.18.191.0/24 +# node_interface: +# ch-dione: eno2 +# ch-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') }}" kubernetes_metrics_server_version: 0.5.0 -- cgit v1.2.3