diff options
-rw-r--r-- | chaos-at-home/ch-hroottest.yml | 8 | ||||
-rw-r--r-- | dan/ele-thetys.yml | 2 | ||||
-rw-r--r-- | dan/sk-cloudia.yml | 2 | ||||
-rw-r--r-- | dan/sk-tomnext-nc.yml | 2 | ||||
-rw-r--r-- | inventory/host_vars/ch-hroottest.yml | 28 | ||||
-rw-r--r-- | inventory/hosts.ini | 1 | ||||
-rw-r--r-- | roles/kubernetes/standalone/base/defaults/main.yml (renamed from roles/kubernetes/standalone/defaults/main.yml) | 0 | ||||
-rw-r--r-- | roles/kubernetes/standalone/base/handlers/main.yml (renamed from roles/kubernetes/standalone/handlers/main.yml) | 0 | ||||
-rw-r--r-- | roles/kubernetes/standalone/base/tasks/main.yml (renamed from roles/kubernetes/standalone/tasks/main.yml) | 0 | ||||
-rw-r--r-- | roles/kubernetes/standalone/base/templates/cni-no-portmap.conflist.j2 (renamed from roles/kubernetes/standalone/templates/cni-no-portmap.conflist.j2) | 0 | ||||
-rw-r--r-- | roles/kubernetes/standalone/base/templates/cni-with-localonly-portmap.conflist.j2 (renamed from roles/kubernetes/standalone/templates/cni-with-localonly-portmap.conflist.j2) | 0 | ||||
-rw-r--r-- | roles/kubernetes/standalone/base/templates/cni-with-portmap.conflist.j2 (renamed from roles/kubernetes/standalone/templates/cni-with-portmap.conflist.j2) | 0 | ||||
-rw-r--r-- | roles/kubernetes/standalone/base/templates/kubelet-config.yml.j2 (renamed from roles/kubernetes/standalone/templates/kubelet-config.yml.j2) | 0 | ||||
-rw-r--r-- | roles/kubernetes/standalone/base/templates/kubelet.service.override.j2 (renamed from roles/kubernetes/standalone/templates/kubelet.service.override.j2) | 0 | ||||
-rw-r--r-- | spreadspace/lw-thetys.yml | 2 |
15 files changed, 33 insertions, 12 deletions
diff --git a/chaos-at-home/ch-hroottest.yml b/chaos-at-home/ch-hroottest.yml index 064bea36..d8bc019a 100644 --- a/chaos-at-home/ch-hroottest.yml +++ b/chaos-at-home/ch-hroottest.yml @@ -10,6 +10,8 @@ - role: zfs/base - role: apt-repo/spreadspace - role: zfs/sanoid - - role: vm/host - - role: installer/debian/base - - role: installer/openbsd/base + # - role: vm/host + # - role: installer/debian/base + # - role: installer/openbsd/base + - role: kubernetes/base + - role: kubernetes/standalone/base diff --git a/dan/ele-thetys.yml b/dan/ele-thetys.yml index 60e8555e..66ca1d76 100644 --- a/dan/ele-thetys.yml +++ b/dan/ele-thetys.yml @@ -11,4 +11,4 @@ - role: blackmagic-desktopvideo - role: apt-repo/spreadspace - role: kubernetes/base - - role: kubernetes/standalone + - role: kubernetes/standalone/base diff --git a/dan/sk-cloudia.yml b/dan/sk-cloudia.yml index f3a46e7c..e58669d1 100644 --- a/dan/sk-cloudia.yml +++ b/dan/sk-cloudia.yml @@ -13,7 +13,7 @@ # - role: core/admin-users # - role: zfs/base # - role: kubernetes/base - # - role: kubernetes/standalone + # - role: kubernetes/standalone/base # - role: apt-repo/spreadspace # - role: acmetool/base # - role: nginx/base diff --git a/dan/sk-tomnext-nc.yml b/dan/sk-tomnext-nc.yml index 326dcf4b..3924551a 100644 --- a/dan/sk-tomnext-nc.yml +++ b/dan/sk-tomnext-nc.yml @@ -11,7 +11,7 @@ - role: apt-repo/spreadspace - role: zfs/sanoid - role: kubernetes/base - - role: kubernetes/standalone + - role: kubernetes/standalone/base - role: acmetool/base - role: nginx/base - role: postfix/simple diff --git a/inventory/host_vars/ch-hroottest.yml b/inventory/host_vars/ch-hroottest.yml index f07198b1..7c08fe04 100644 --- a/inventory/host_vars/ch-hroottest.yml +++ b/inventory/host_vars/ch-hroottest.yml @@ -30,8 +30,26 @@ zfs_zpools: mountpoint: /srv/storage create_vdevs: mirror /dev/disk/by-id/ata-SAMSUNG_HD753LJ_S13UJ1LS801071-part3 /dev/disk/by-id/ata-SAMSUNG_HD753LJ_S13UJ1BQ802393-part3 -zfs_sanoid_modules: - storage/vm: - use_template: production - recursive: yes - process_children_only: yes +# zfs_sanoid_modules: +# storage/vm: +# use_template: production +# recursive: yes +# process_children_only: yes + +docker_zfs: + pool: storage + name: docker + properties: + quota: 15G + +kubelet_zfs: + pool: storage + name: kubelet + properties: + quota: 15G + +kubernetes_version: 1.18.5 +kubernetes_container_runtime: docker +kubernetes_standalone_max_pods: 15 +kubernetes_standalone_pod_cidr: 192.168.255.0/24 +kubernetes_standalone_cni_variant: with-portmap diff --git a/inventory/hosts.ini b/inventory/hosts.ini index c3f1c7ee..3718d7d2 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -357,6 +357,7 @@ sk-cloudia ele-thetys lw-thetys sk-tomnext-nc +ch-hroottest [kubernetes:children] kubernetes-cluster diff --git a/roles/kubernetes/standalone/defaults/main.yml b/roles/kubernetes/standalone/base/defaults/main.yml index b0c14b11..b0c14b11 100644 --- a/roles/kubernetes/standalone/defaults/main.yml +++ b/roles/kubernetes/standalone/base/defaults/main.yml diff --git a/roles/kubernetes/standalone/handlers/main.yml b/roles/kubernetes/standalone/base/handlers/main.yml index 26438551..26438551 100644 --- a/roles/kubernetes/standalone/handlers/main.yml +++ b/roles/kubernetes/standalone/base/handlers/main.yml diff --git a/roles/kubernetes/standalone/tasks/main.yml b/roles/kubernetes/standalone/base/tasks/main.yml index 241c3136..241c3136 100644 --- a/roles/kubernetes/standalone/tasks/main.yml +++ b/roles/kubernetes/standalone/base/tasks/main.yml diff --git a/roles/kubernetes/standalone/templates/cni-no-portmap.conflist.j2 b/roles/kubernetes/standalone/base/templates/cni-no-portmap.conflist.j2 index be47f216..be47f216 100644 --- a/roles/kubernetes/standalone/templates/cni-no-portmap.conflist.j2 +++ b/roles/kubernetes/standalone/base/templates/cni-no-portmap.conflist.j2 diff --git a/roles/kubernetes/standalone/templates/cni-with-localonly-portmap.conflist.j2 b/roles/kubernetes/standalone/base/templates/cni-with-localonly-portmap.conflist.j2 index acaf7eba..acaf7eba 100644 --- a/roles/kubernetes/standalone/templates/cni-with-localonly-portmap.conflist.j2 +++ b/roles/kubernetes/standalone/base/templates/cni-with-localonly-portmap.conflist.j2 diff --git a/roles/kubernetes/standalone/templates/cni-with-portmap.conflist.j2 b/roles/kubernetes/standalone/base/templates/cni-with-portmap.conflist.j2 index 9f9b2b9a..9f9b2b9a 100644 --- a/roles/kubernetes/standalone/templates/cni-with-portmap.conflist.j2 +++ b/roles/kubernetes/standalone/base/templates/cni-with-portmap.conflist.j2 diff --git a/roles/kubernetes/standalone/templates/kubelet-config.yml.j2 b/roles/kubernetes/standalone/base/templates/kubelet-config.yml.j2 index d6af0f24..d6af0f24 100644 --- a/roles/kubernetes/standalone/templates/kubelet-config.yml.j2 +++ b/roles/kubernetes/standalone/base/templates/kubelet-config.yml.j2 diff --git a/roles/kubernetes/standalone/templates/kubelet.service.override.j2 b/roles/kubernetes/standalone/base/templates/kubelet.service.override.j2 index fe8bfb4c..fe8bfb4c 100644 --- a/roles/kubernetes/standalone/templates/kubelet.service.override.j2 +++ b/roles/kubernetes/standalone/base/templates/kubelet.service.override.j2 diff --git a/spreadspace/lw-thetys.yml b/spreadspace/lw-thetys.yml index 4adbb893..3c177627 100644 --- a/spreadspace/lw-thetys.yml +++ b/spreadspace/lw-thetys.yml @@ -11,5 +11,5 @@ - role: blackmagic-desktopvideo - role: apt-repo/spreadspace - role: kubernetes/base - - role: kubernetes/standalone + - role: kubernetes/standalone/base - role: wireguard/base |