summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dan/sk-cloudia.yml2
-rw-r--r--inventory/host_vars/sk-cloudia/vars.yml8
2 files changed, 5 insertions, 5 deletions
diff --git a/dan/sk-cloudia.yml b/dan/sk-cloudia.yml
index 55be54e0..c596ebd1 100644
--- a/dan/sk-cloudia.yml
+++ b/dan/sk-cloudia.yml
@@ -5,9 +5,9 @@
- role: base
- role: sshd
- role: zsh
+ - role: apt-repo/base
- role: admin-user
- role: zfs/base
- - role: containerd
- role: kubernetes/base
- role: kubernetes/standalone
- role: apt-repo/spreadspace
diff --git a/inventory/host_vars/sk-cloudia/vars.yml b/inventory/host_vars/sk-cloudia/vars.yml
index afeee13d..f3b832e9 100644
--- a/inventory/host_vars/sk-cloudia/vars.yml
+++ b/inventory/host_vars/sk-cloudia/vars.yml
@@ -21,9 +21,9 @@ zfs_arc_size:
max: "{{ 16 * 1024 * 1024 * 1024 }}"
-containerd_zfs:
+docker_zfs:
pool: storage
- name: containerd
+ name: docker
size: 40G
kubelet_zfs:
@@ -31,8 +31,8 @@ kubelet_zfs:
name: kubelet
size: 20G
-kubernetes_version: 1.17.5
-kubernetes_container_runtime: containerd
+kubernetes_version: 1.18.2
+kubernetes_container_runtime: docker
kubernetes_standalone_max_pods: 42
kubernetes_standalone_resolv_conf: /var/run/systemd/resolve/resolv.conf
kubernetes_standalone_pod_cidr: 192.168.255.0/24