summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2022-01-11 20:17:36 +0100
committerChristian Pointner <equinox@spreadspace.org>2022-01-11 20:17:36 +0100
commit9543a65d0bbe8c43bce966b32a7571b146edabba (patch)
treef7f24419eb82c5b89cabea6946767f45e893475e
parentmove lendwirbel k8s cluster to graveyard (diff)
finalize move to cri-tools from spreadspace repo
-rw-r--r--inventory/host_vars/sgg-icecast.yml1
-rw-r--r--inventory/host_vars/sk-cloudio/nextcloud.yml6
-rw-r--r--inventory/host_vars/sk-cloudio/vars.yml5
-rw-r--r--inventory/host_vars/sk-tomnext-nc.yml7
4 files changed, 13 insertions, 6 deletions
diff --git a/inventory/host_vars/sgg-icecast.yml b/inventory/host_vars/sgg-icecast.yml
index 07871fe0..ab4b91b1 100644
--- a/inventory/host_vars/sgg-icecast.yml
+++ b/inventory/host_vars/sgg-icecast.yml
@@ -33,6 +33,7 @@ external_ip: "{{ network.primary.overlay }}"
spreadspace_apt_repo_components:
+ - main
- container
nginx_server_names_hash_bucket_size: 64
diff --git a/inventory/host_vars/sk-cloudio/nextcloud.yml b/inventory/host_vars/sk-cloudio/nextcloud.yml
index 48a56f43..7fe81abd 100644
--- a/inventory/host_vars/sk-cloudio/nextcloud.yml
+++ b/inventory/host_vars/sk-cloudio/nextcloud.yml
@@ -8,7 +8,7 @@ nextcloud_zfs:
nextcloud_instances:
wolke.elevate.at:
# new: true
- version: 22.2.3
+ version: 23.0.0
port: 8100
hostnames:
- wolke.elevate.at
@@ -20,7 +20,7 @@ nextcloud_instances:
password: "{{ vault_nextcloud_database_passwords['wolke.elevate.at'] }}"
insomnia.skillz.biz:
# new: true
- version: 22.2.3
+ version: 23.0.0
port: 8101
hostnames:
- insomnia.skillz.biz
@@ -44,7 +44,7 @@ nextcloud_instances:
password: "{{ vault_nextcloud_database_passwords['nc.skillz.biz'] }}"
wae.elevate.at:
# new: true
- version: 22.2.3
+ version: 23.0.0
port: 8104
hostnames:
- wae.elevate.at
diff --git a/inventory/host_vars/sk-cloudio/vars.yml b/inventory/host_vars/sk-cloudio/vars.yml
index ed6c0126..e54e39d0 100644
--- a/inventory/host_vars/sk-cloudio/vars.yml
+++ b/inventory/host_vars/sk-cloudio/vars.yml
@@ -36,6 +36,10 @@ apt_repo_components:
- contrib ## for zfs
- non-free ## for microcode updates
+spreadspace_apt_repo_components:
+ - main
+ - container
+
zfs_arc_size:
min: 2GB
@@ -80,7 +84,6 @@ kubelet_storage:
quota: 20G
kubernetes_version: 1.22.2
-kubernetes_cri_tools_pkg_version: 1.21.0~2
kubernetes_container_runtime: docker
kubernetes_standalone_max_pods: 100
kubernetes_standalone_pod_cidr: 192.168.255.0/24
diff --git a/inventory/host_vars/sk-tomnext-nc.yml b/inventory/host_vars/sk-tomnext-nc.yml
index 16a49c95..6a99d4b0 100644
--- a/inventory/host_vars/sk-tomnext-nc.yml
+++ b/inventory/host_vars/sk-tomnext-nc.yml
@@ -59,6 +59,10 @@ apt_repo_components:
- main
- contrib ## for zfs
+spreadspace_apt_repo_components:
+ - main
+ - container
+
zfs_arc_size:
min: 2GB
@@ -95,7 +99,6 @@ kubelet_storage:
quota: 15G
kubernetes_version: 1.22.2
-kubernetes_cri_tools_pkg_version: 1.21.0~2
kubernetes_container_runtime: docker
kubernetes_standalone_max_pods: 15
kubernetes_standalone_pod_cidr: 192.168.255.0/24
@@ -124,7 +127,7 @@ nextcloud_zfs:
nextcloud_instances:
team.tomwaitz.eu:
# new: true
- version: 21.0.4
+ version: 22.2.3
port: 8100
hostnames:
- team.tomwaitz.eu