summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2022-01-13 21:31:14 +0100
committerChristian Pointner <equinox@spreadspace.org>2022-01-13 21:31:14 +0100
commita1827fa8f5add7a6780f7f7436ebcbac8b003998 (patch)
tree7935f11623cbbad2cd18d9f6d8cec9f26e93c6cb
parentupgrade kube-router to 1.4.0 (diff)
prepare k8s-emc cluster for bullseye and 1.23
-rw-r--r--dan/k8s-emc.yml1
-rw-r--r--inventory/group_vars/emc/vars.yml19
-rw-r--r--inventory/group_vars/k8s-chtest/vars.yml23
-rw-r--r--inventory/group_vars/k8s-emc/vars.yml7
-rw-r--r--inventory/host_vars/ele-dione.yml25
-rw-r--r--inventory/host_vars/ele-helene.yml25
-rw-r--r--inventory/host_vars/emc-master.yml24
7 files changed, 84 insertions, 40 deletions
diff --git a/dan/k8s-emc.yml b/dan/k8s-emc.yml
index 96b61066..468919ef 100644
--- a/dan/k8s-emc.yml
+++ b/dan/k8s-emc.yml
@@ -6,6 +6,7 @@
- role: core/base
- role: core/sshd/base
- role: core/zsh
+ - role: core/ntp
- role: apt-repo/spreadspace
- role: monitoring/prometheus/exporter
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
diff --git a/inventory/host_vars/ele-dione.yml b/inventory/host_vars/ele-dione.yml
index 37523b61..6c26d22f 100644
--- a/inventory/host_vars/ele-dione.yml
+++ b/inventory/host_vars/ele-dione.yml
@@ -3,6 +3,24 @@ install:
efi: true
disks:
primary: /dev/disk/by-id/nvme-SAMSUNG_MZVPW256HEGL-00000_S346NY0HC29501
+ 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
kernel_cmdline:
- "consoleblank=0"
- "nomodeset"
@@ -25,19 +43,14 @@ apt_repo_components:
- non-free ## for microcode updates
spreadspace_apt_repo_components:
- - main
- prometheus
- container
-base_packages_extra_host:
- - exfat-fuse
- - exfat-utils
- - vlan
-
admin_users_host:
- equinox
+
containerd_storage:
type: lvm
vg: "{{ host_name }}"
diff --git a/inventory/host_vars/ele-helene.yml b/inventory/host_vars/ele-helene.yml
index 21d7eb5a..7a3d082e 100644
--- a/inventory/host_vars/ele-helene.yml
+++ b/inventory/host_vars/ele-helene.yml
@@ -3,6 +3,24 @@ install:
efi: true
disks:
primary: /dev/disk/by-id/nvme-SAMSUNG_MZVPW256HEGL-00000_S346NB0J803346
+ 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
kernel_cmdline:
- "consoleblank=0"
- "nomodeset"
@@ -25,19 +43,14 @@ apt_repo_components:
- non-free ## for microcode updates
spreadspace_apt_repo_components:
- - main
- prometheus
- container
-base_packages_extra_host:
- - exfat-fuse
- - exfat-utils
- - vlan
-
admin_users_host:
- equinox
+
containerd_storage:
type: lvm
vg: "{{ host_name }}"
diff --git a/inventory/host_vars/emc-master.yml b/inventory/host_vars/emc-master.yml
index 77cc5d32..6ee3587a 100644
--- a/inventory/host_vars/emc-master.yml
+++ b/inventory/host_vars/emc-master.yml
@@ -11,6 +11,24 @@ install:
type: zfs
name: root
size: 20g
+ 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
sdb:
type: blockdev
path: /dev/zvol/storage/streamstats
@@ -34,6 +52,12 @@ network:
external_ip: "{{ network.primary.overlay }}"
+
+spreadspace_apt_repo_components:
+ - prometheus
+ - container
+
+
containerd_storage:
type: lvm
vg: "{{ host_name }}"