diff options
Diffstat (limited to 'inventory/group_vars')
-rw-r--r-- | inventory/group_vars/emc/vars.yml | 1 | ||||
-rw-r--r-- | inventory/group_vars/k8s-chtest/vars.yml | 4 | ||||
-rw-r--r-- | inventory/group_vars/k8s-emc/vars.yml | 3 | ||||
-rw-r--r-- | inventory/group_vars/k8s-lwl/vars.yml | 50 | ||||
-rw-r--r-- | inventory/group_vars/lendwirbel-live-xx/vars.yml | 2 | ||||
-rw-r--r-- | inventory/group_vars/lendwirbel-live/vars.yml | 29 |
6 files changed, 4 insertions, 85 deletions
diff --git a/inventory/group_vars/emc/vars.yml b/inventory/group_vars/emc/vars.yml index df2ac782..eb0576fd 100644 --- a/inventory/group_vars/emc/vars.yml +++ b/inventory/group_vars/emc/vars.yml @@ -12,6 +12,7 @@ prometheus_scrape_endpoint: "{{ ansible_default_ipv4.address }}:9999" spreadspace_apt_repo_components: - main - prometheus + - container containerd_storage: diff --git a/inventory/group_vars/k8s-chtest/vars.yml b/inventory/group_vars/k8s-chtest/vars.yml index 60450f88..93678de5 100644 --- a/inventory/group_vars/k8s-chtest/vars.yml +++ b/inventory/group_vars/k8s-chtest/vars.yml @@ -1,7 +1,7 @@ --- docker_pkg_provider: docker-com -kubernetes_version: 1.20.2 +kubernetes_version: 1.22.5 kubernetes_container_runtime: docker kubernetes_network_plugin: kubeguard # kubernetes_network_plugin_variant: with-kube-router @@ -45,4 +45,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.4.1 +kubernetes_metrics_server_version: 0.5.0 diff --git a/inventory/group_vars/k8s-emc/vars.yml b/inventory/group_vars/k8s-emc/vars.yml index 234defd8..e2b82c8f 100644 --- a/inventory/group_vars/k8s-emc/vars.yml +++ b/inventory/group_vars/k8s-emc/vars.yml @@ -1,8 +1,7 @@ --- containerd_pkg_provider: docker-com -kubernetes_version: 1.22.2 -kubernetes_cri_tools_pkg_version: 1.21.0~2 +kubernetes_version: 1.22.5 kubernetes_container_runtime: containerd kubernetes_network_plugin: kubeguard diff --git a/inventory/group_vars/k8s-lwl/vars.yml b/inventory/group_vars/k8s-lwl/vars.yml deleted file mode 100644 index cd375971..00000000 --- a/inventory/group_vars/k8s-lwl/vars.yml +++ /dev/null @@ -1,50 +0,0 @@ ---- -docker_pkg_provider: docker-com - -kubernetes_version: 1.17.5 -kubernetes_container_runtime: docker -kubernetes_network_plugin: kubeguard - -kubernetes: - cluster_name: lndwrbl-live - - dedicated_master: False - api_extra_sans: - - 178.63.180.137 - - k8s-master.lndwrbl.live - - pod_ip_range: 172.18.0.0/16 - pod_ip_range_size: 24 - service_ip_range: 172.18.192.0/18 - - -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: - lw-live-01: 1 - lw-live-02: 2 - lw-live-03: 3 - lw-live-00: 100 - lw-live-dist0: 110 - lw-dione: 111 - lw-helene: 112 - lw-master: 127 - - direct_net_zones: - encoder: - transfer_net: 172.18.191.0/24 - node_interface: - lw-dione: eno2 - lw-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.3.7 diff --git a/inventory/group_vars/lendwirbel-live-xx/vars.yml b/inventory/group_vars/lendwirbel-live-xx/vars.yml deleted file mode 100644 index 6defdb17..00000000 --- a/inventory/group_vars/lendwirbel-live-xx/vars.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -install_playbook: lendwirbel-live-xx diff --git a/inventory/group_vars/lendwirbel-live/vars.yml b/inventory/group_vars/lendwirbel-live/vars.yml deleted file mode 100644 index a06be375..00000000 --- a/inventory/group_vars/lendwirbel-live/vars.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- -zsh_banner: lendwirbel - -acmetool_account_email: equinox@spreadspace.org -acmetool_directory_server: "{{ acmetool_directory_server_le_live_v2 }}" - -apt_repo_blackmagic_auth: - username: "spreadspace" - password: "{{ vault_apt_repo_blackmagic_auth.password }}" - -install: - cloud: - credentials: - token: "{{ vault_hcloud_api_token }}" - - -docker_storage: - type: lvm - vg: "{{ host_name }}" - lv: docker - size: 15G - fs: ext4 - -kubelet_storage: - type: lvm - vg: "{{ host_name }}" - lv: kubelet - size: 10G - fs: ext4 |