Merge branch 'topic/k8s-containerd'

16 files changed, 45 insertions, 13 deletions

diff --git a/inventory/host_vars/ch-equinox-t450s.yml b/inventory/host_vars/ch-equinox-t450s.yml
index 4266c3bf..14773889 100644
--- a/inventory/host_vars/ch-equinox-t450s.yml
+++ b/inventory/host_vars/ch-equinox-t450s.yml
@@ -183,6 +183,7 @@ ws_base_extra_packages:
   - python3-ruamel.yaml
   - python3-sphinx
   - python3-sphinx-rtd-theme
+  - python3-toml
   - qemu-kvm
   - qemu-utils
   - quilt
@@ -241,6 +242,10 @@ ws_base_extra_packages:
   # needs apt-repo/tor-project
   - tor
   - tor-geoipdb
+  # needs apt-repo/github-containers
+  - buildah
+  - containernetworking-plugins
+  - podman
   # needs apt-repo/kubernetes
   - kubectl
   # needs apt-repo/riot
diff --git a/inventory/host_vars/ch-equinox-ws.yml b/inventory/host_vars/ch-equinox-ws.yml
index 0799bbfe..8f4b709e 100644
--- a/inventory/host_vars/ch-equinox-ws.yml
+++ b/inventory/host_vars/ch-equinox-ws.yml
@@ -180,6 +180,7 @@ ws_base_extra_packages:
   - python3-ruamel.yaml
   - python3-sphinx
   - python3-sphinx-rtd-theme
+  - python3-toml
   - qemu-kvm
   - qemu-utils
   - quilt
@@ -240,6 +241,10 @@ ws_base_extra_packages:
   # needs apt-repo/tor-project
   - tor
   - tor-geoipdb
+  # needs apt-repo/github-containers
+  - buildah
+  - containernetworking-plugins
+  - podman
   # needs apt-repo/kubernetes
   - kubectl
   # needs apt-repo/riot
diff --git a/inventory/host_vars/ch-testvm-prometheus.yml b/inventory/host_vars/ch-testvm-prometheus.yml
index 597cd134..d11d565c 100644
--- a/inventory/host_vars/ch-testvm-prometheus.yml
+++ b/inventory/host_vars/ch-testvm-prometheus.yml
@@ -12,7 +12,7 @@ install:
       sda:
         type: zfs
         name: root
-        size: 5g
+        size: 50g
   interfaces:
   - bridge: br-svc
     name: svc0
@@ -31,3 +31,24 @@ network:
       gateway: "{{ network_zones.svc.prefix | ipaddr(network_zones.svc.offsets['ch-gw-lan']) | ipaddr('address') }}"
   interfaces:
   - *_network_primary_
+
+
+
+containerd_storage:
+  type: lvm
+  vg: "{{ host_name }}"
+  lv: containerd
+  size: 20G
+  fs: ext4
+
+kubelet_storage:
+  type: lvm
+  vg: "{{ host_name }}"
+  lv: kubelet
+  size: 15G
+  fs: ext4
+
+kubernetes_version: 1.21.1
+kubernetes_container_runtime: containerd
+kubernetes_standalone_max_pods: 42
+kubernetes_standalone_cni_variant: with-portmap
diff --git a/inventory/host_vars/ch-thetys.yml b/inventory/host_vars/ch-thetys.yml
index 5ebc387a..77e9470c 100644
--- a/inventory/host_vars/ch-thetys.yml
+++ b/inventory/host_vars/ch-thetys.yml
@@ -47,7 +47,7 @@ kubelet_storage:
   size: 5G
   fs: ext4
 
-kubernetes_version: 1.20.5
+kubernetes_version: 1.21.1
 kubernetes_container_runtime: docker
 kubernetes_standalone_max_pods: 42
 kubernetes_standalone_cni_variant: with-portmap
diff --git a/inventory/host_vars/ele-thetys.yml b/inventory/host_vars/ele-thetys.yml
index 73807915..7901beda 100644
--- a/inventory/host_vars/ele-thetys.yml
+++ b/inventory/host_vars/ele-thetys.yml
@@ -42,7 +42,7 @@ kubelet_storage:
   size: 5G
   fs: ext4
 
-kubernetes_version: 1.20.5
+kubernetes_version: 1.21.1
 kubernetes_container_runtime: docker
 kubernetes_standalone_max_pods: 42
 kubernetes_standalone_cni_variant: with-portmap
diff --git a/inventory/host_vars/glt-calypso.yml b/inventory/host_vars/glt-calypso.yml
index 3f6a42dd..bdd377cc 100644
--- a/inventory/host_vars/glt-calypso.yml
+++ b/inventory/host_vars/glt-calypso.yml
@@ -72,7 +72,7 @@ kubelet_storage:
   size: 10G
   fs: ext4
 
-kubernetes_version: 1.20.5
+kubernetes_version: 1.21.1
 kubernetes_container_runtime: docker
 kubernetes_standalone_max_pods: 42
 kubernetes_standalone_cni_variant: with-portmap
diff --git a/inventory/host_vars/glt-coturn.yml b/inventory/host_vars/glt-coturn.yml
index f3f814d0..f598384d 100644
--- a/inventory/host_vars/glt-coturn.yml
+++ b/inventory/host_vars/glt-coturn.yml
@@ -13,7 +13,7 @@ kubelet_storage:
   size: 5G
   fs: ext4
 
-kubernetes_version: 1.20.5
+kubernetes_version: 1.21.1
 kubernetes_container_runtime: docker
 kubernetes_standalone_max_pods: 100
 kubernetes_standalone_pod_cidr: 192.168.255.0/24
diff --git a/inventory/host_vars/glt-datacop.yml b/inventory/host_vars/glt-datacop.yml
index 47982c29..e66eba05 100644
--- a/inventory/host_vars/glt-datacop.yml
+++ b/inventory/host_vars/glt-datacop.yml
@@ -67,7 +67,7 @@ kubelet_storage:
   size: 10G
   fs: ext4
 
-kubernetes_version: 1.20.5
+kubernetes_version: 1.21.1
 kubernetes_container_runtime: docker
 kubernetes_standalone_max_pods: 42
 kubernetes_standalone_cni_variant: with-portmap
diff --git a/inventory/host_vars/glt-dione.yml b/inventory/host_vars/glt-dione.yml
index 4e41ef41..c860d301 100644
--- a/inventory/host_vars/glt-dione.yml
+++ b/inventory/host_vars/glt-dione.yml
@@ -62,7 +62,7 @@ kubelet_storage:
   size: 10G
   fs: ext4
 
-kubernetes_version: 1.20.5
+kubernetes_version: 1.21.1
 kubernetes_container_runtime: docker
 kubernetes_standalone_max_pods: 42
 kubernetes_standalone_cni_variant: with-portmap
diff --git a/inventory/host_vars/glt-helene.yml b/inventory/host_vars/glt-helene.yml
index 4a927036..c016b0a7 100644
--- a/inventory/host_vars/glt-helene.yml
+++ b/inventory/host_vars/glt-helene.yml
@@ -62,7 +62,7 @@ kubelet_storage:
   size: 10G
   fs: ext4
 
-kubernetes_version: 1.20.5
+kubernetes_version: 1.21.1
 kubernetes_container_runtime: docker
 kubernetes_standalone_max_pods: 42
 kubernetes_standalone_cni_variant: with-portmap
diff --git a/inventory/host_vars/glt-jitsi.yml b/inventory/host_vars/glt-jitsi.yml
index 15a27ffb..966f3a74 100644
--- a/inventory/host_vars/glt-jitsi.yml
+++ b/inventory/host_vars/glt-jitsi.yml
@@ -13,7 +13,7 @@ kubelet_storage:
   size: 5G
   fs: ext4
 
-kubernetes_version: 1.20.5
+kubernetes_version: 1.21.1
 kubernetes_container_runtime: docker
 kubernetes_standalone_max_pods: 100
 kubernetes_standalone_pod_cidr: 192.168.255.0/24
diff --git a/inventory/host_vars/glt-telesto.yml b/inventory/host_vars/glt-telesto.yml
index ed38a7b2..3ce9154c 100644
--- a/inventory/host_vars/glt-telesto.yml
+++ b/inventory/host_vars/glt-telesto.yml
@@ -72,7 +72,7 @@ kubelet_storage:
   size: 10G
   fs: ext4
 
-kubernetes_version: 1.20.5
+kubernetes_version: 1.21.1
 kubernetes_container_runtime: docker
 kubernetes_standalone_max_pods: 42
 kubernetes_standalone_cni_variant: with-portmap
diff --git a/inventory/host_vars/glt-thetys.yml b/inventory/host_vars/glt-thetys.yml
index a80ebabe..51aaee89 100644
--- a/inventory/host_vars/glt-thetys.yml
+++ b/inventory/host_vars/glt-thetys.yml
@@ -67,7 +67,7 @@ kubelet_storage:
   size: 5G
   fs: ext4
 
-kubernetes_version: 1.20.5
+kubernetes_version: 1.21.1
 kubernetes_container_runtime: docker
 kubernetes_standalone_max_pods: 42
 kubernetes_standalone_cni_variant: with-portmap
diff --git a/inventory/host_vars/lw-thetys.yml b/inventory/host_vars/lw-thetys.yml
index 2c5d998c..706557f7 100644
--- a/inventory/host_vars/lw-thetys.yml
+++ b/inventory/host_vars/lw-thetys.yml
@@ -43,7 +43,7 @@ kubelet_storage:
   size: 5G
   fs: ext4
 
-kubernetes_version: 1.20.5
+kubernetes_version: 1.21.1
 kubernetes_container_runtime: docker
 kubernetes_standalone_max_pods: 42
 kubernetes_standalone_cni_variant: with-portmap
diff --git a/inventory/host_vars/s2-thetys.yml b/inventory/host_vars/s2-thetys.yml
index de2afaa5..957abfb0 100644
--- a/inventory/host_vars/s2-thetys.yml
+++ b/inventory/host_vars/s2-thetys.yml
@@ -49,7 +49,7 @@ kubelet_storage:
   size: 5G
   fs: ext4
 
-kubernetes_version: 1.20.5
+kubernetes_version: 1.21.1
 kubernetes_container_runtime: docker
 kubernetes_standalone_max_pods: 42
 kubernetes_standalone_cni_variant: with-portmap
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index 4c31b999..8d03b7b1 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -457,6 +457,7 @@ glt-telesto
 glt-datacop
 glt-thetys
 sgg-icecast
+ch-testvm-prometheus
 
 [kubernetes:children]
 kubernetes-cluster