From bbb9f4e09ba78eaf518d8e66caf5a437ebc6439b Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sun, 14 Jun 2020 16:26:00 +0200
Subject: docker/containerd/kubelet: more flexible handling of zfs properties

---
 inventory/host_vars/sk-cloudia/vars.yml | 6 ++++--
 inventory/host_vars/sk-tomnext-nc.yml   | 8 +++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'inventory')

diff --git a/inventory/host_vars/sk-cloudia/vars.yml b/inventory/host_vars/sk-cloudia/vars.yml
index 085a9c95..d7a2474e 100644
--- a/inventory/host_vars/sk-cloudia/vars.yml
+++ b/inventory/host_vars/sk-cloudia/vars.yml
@@ -26,12 +26,14 @@ zfs_zpools:
 docker_zfs:
   pool: storage
   name: docker
-  size: 40G
+  properties:
+    quota: 40G
 
 kubelet_zfs:
   pool: storage
   name: kubelet
-  size: 20G
+  properties:
+    quota: 20G
 
 kubernetes_version: 1.18.2
 kubernetes_container_runtime: docker
diff --git a/inventory/host_vars/sk-tomnext-nc.yml b/inventory/host_vars/sk-tomnext-nc.yml
index cef64bb0..766bdcff 100644
--- a/inventory/host_vars/sk-tomnext-nc.yml
+++ b/inventory/host_vars/sk-tomnext-nc.yml
@@ -61,12 +61,14 @@ zfs_sanoid_modules:
 docker_zfs:
   pool: storage
   name: docker
-  size: 15G
+  properties:
+    quota: 15G
 
 kubelet_zfs:
   pool: storage
   name: kubelet
-  size: 15G
+  properties:
+    quota: 15G
 
 kubernetes_version: 1.18.3
 kubernetes_container_runtime: docker
@@ -96,7 +98,7 @@ nextcloud_zfs:
 nextcloud_instances:
   team.tomwaitz.eu:
     # new: true
-    version: 18.0.4
+    version: 18.0.6
     port: 8100
     hostnames:
       - team.tomwaitz.eu
-- 
cgit v1.2.3