diff options
author | Christian Pointner <equinox@spreadspace.org> | 2022-01-13 21:31:14 +0100 |
---|---|---|
committer | Christian Pointner <equinox@spreadspace.org> | 2022-01-13 21:31:14 +0100 |
commit | a1827fa8f5add7a6780f7f7436ebcbac8b003998 (patch) | |
tree | 7935f11623cbbad2cd18d9f6d8cec9f26e93c6cb /inventory/group_vars | |
parent | upgrade kube-router to 1.4.0 (diff) |
prepare k8s-emc cluster for bullseye and 1.23
Diffstat (limited to 'inventory/group_vars')
-rw-r--r-- | inventory/group_vars/emc/vars.yml | 19 | ||||
-rw-r--r-- | inventory/group_vars/k8s-chtest/vars.yml | 23 | ||||
-rw-r--r-- | inventory/group_vars/k8s-emc/vars.yml | 7 |
3 files changed, 21 insertions, 28 deletions
diff --git a/inventory/group_vars/emc/vars.yml b/inventory/group_vars/emc/vars.yml index eb0576fd..28290566 100644 --- a/inventory/group_vars/emc/vars.yml +++ b/inventory/group_vars/emc/vars.yml @@ -5,12 +5,29 @@ install: cloud: credentials: token: "{{ vault_hcloud_api_token }}" + system_lvm: + volumes: + - name: root + size: 3G + filesystem: ext4 + mountpoint: / + - name: var + size: 1280M + filesystem: ext4 + mountpoint: /var + - name: var+log + size: 768M + filesystem: ext4 + mountpoint: /var/log + mount_options: + - noatime + - nodev + - noexec prometheus_scrape_endpoint: "{{ ansible_default_ipv4.address }}:9999" spreadspace_apt_repo_components: - - main - prometheus - container diff --git a/inventory/group_vars/k8s-chtest/vars.yml b/inventory/group_vars/k8s-chtest/vars.yml index 2fc9ef5d..e8049d4e 100644 --- a/inventory/group_vars/k8s-chtest/vars.yml +++ b/inventory/group_vars/k8s-chtest/vars.yml @@ -2,8 +2,6 @@ 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: kube-router kubernetes_network_plugin_version: 1.4.0 kubernetes_network_plugin_replaces_kube_proxy: true @@ -24,25 +22,4 @@ kubernetes: 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') }}" - kubernetes_metrics_server_version: 0.5.2 diff --git a/inventory/group_vars/k8s-emc/vars.yml b/inventory/group_vars/k8s-emc/vars.yml index e2b82c8f..c1f0c6f9 100644 --- a/inventory/group_vars/k8s-emc/vars.yml +++ b/inventory/group_vars/k8s-emc/vars.yml @@ -1,7 +1,6 @@ --- -containerd_pkg_provider: docker-com - -kubernetes_version: 1.22.5 +kubernetes_version: 1.23.1 +kubernetes_cri_tools_pkg_version: 1.22.0-1 kubernetes_container_runtime: containerd kubernetes_network_plugin: kubeguard @@ -50,4 +49,4 @@ kubeguard: 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 +kubernetes_metrics_server_version: 0.5.2 |