summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2023-07-13 22:07:17 +0200
committerChristian Pointner <equinox@spreadspace.org>2023-07-13 22:07:17 +0200
commite39ad37d3d6755ef59982dc937f0dccf961e7887 (patch)
tree8491d441350f70df9dfd4a4485f5e1f0503053e8
parentnextcloud: try adding new mime-type for .mjs extension (diff)
upgrade standalone kubelets and nextcloud containers
-rw-r--r--inventory/host_vars/ch-apps.yml2
-rw-r--r--inventory/host_vars/ch-dione.yml2
-rw-r--r--inventory/host_vars/ch-helene.yml2
-rw-r--r--inventory/host_vars/ele-calypso.yml2
-rw-r--r--inventory/host_vars/ele-coturn.yml2
-rw-r--r--inventory/host_vars/ele-helene.yml2
-rw-r--r--inventory/host_vars/ele-jitsi.yml2
-rw-r--r--inventory/host_vars/ele-media.yml6
-rw-r--r--inventory/host_vars/ele-thetys.yml2
-rw-r--r--inventory/host_vars/glt-calypso.yml2
-rw-r--r--inventory/host_vars/glt-coturn.yml2
-rw-r--r--inventory/host_vars/glt-meet1.yml2
-rw-r--r--inventory/host_vars/glt-meet2.yml2
-rw-r--r--inventory/host_vars/glt-tsdatacop.yml2
-rw-r--r--inventory/host_vars/s2-thetys.yml2
-rw-r--r--inventory/host_vars/sgg-icecast.yml2
-rw-r--r--inventory/host_vars/sk-cloudio/nextcloud.yml4
-rw-r--r--inventory/host_vars/sk-cloudio/vars.yml2
-rw-r--r--inventory/host_vars/sk-tomnext-nc.yml3
-rw-r--r--roles/apps/nextcloud/templates/pod-spec-with-mariadb.yml.j21
-rw-r--r--roles/elevate/media/templates/nextcloud-pod-spec-with-mariadb.yml.j21
-rw-r--r--roles/kubernetes/base/tasks/cri_docker.yml4
22 files changed, 29 insertions, 22 deletions
diff --git a/inventory/host_vars/ch-apps.yml b/inventory/host_vars/ch-apps.yml
index b3aaac8f..3970469d 100644
--- a/inventory/host_vars/ch-apps.yml
+++ b/inventory/host_vars/ch-apps.yml
@@ -111,7 +111,7 @@ kubelet_storage:
quota: 10G
'syncoid:sync': 'false'
-kubernetes_version: 1.27.1
+kubernetes_version: 1.27.3
kubernetes_cri_tools_pkg_version: 1.26.0-00
kubernetes_container_runtime: docker
kubernetes_standalone_max_pods: 42
diff --git a/inventory/host_vars/ch-dione.yml b/inventory/host_vars/ch-dione.yml
index 68af4df5..1ed7b58e 100644
--- a/inventory/host_vars/ch-dione.yml
+++ b/inventory/host_vars/ch-dione.yml
@@ -54,7 +54,7 @@ kubelet_storage:
size: 5G
fs: ext4
-# kubernetes_version: 1.27.1
+# kubernetes_version: 1.27.3
# kubernetes_cri_tools_pkg_version: 1.26.0-00
# kubernetes_container_runtime: docker
# kubernetes_standalone_max_pods: 42
diff --git a/inventory/host_vars/ch-helene.yml b/inventory/host_vars/ch-helene.yml
index 3baeca7c..02fb04ea 100644
--- a/inventory/host_vars/ch-helene.yml
+++ b/inventory/host_vars/ch-helene.yml
@@ -54,7 +54,7 @@ kubelet_storage:
size: 5G
fs: ext4
-# kubernetes_version: 1.27.1
+# kubernetes_version: 1.27.3
# kubernetes_cri_tools_pkg_version: 1.26.0-00
# kubernetes_container_runtime: docker
# kubernetes_standalone_max_pods: 42
diff --git a/inventory/host_vars/ele-calypso.yml b/inventory/host_vars/ele-calypso.yml
index 89842c5c..256200cc 100644
--- a/inventory/host_vars/ele-calypso.yml
+++ b/inventory/host_vars/ele-calypso.yml
@@ -70,7 +70,7 @@ kubelet_storage:
size: 5G
fs: ext4
-kubernetes_version: 1.27.1
+kubernetes_version: 1.27.3
kubernetes_cri_tools_pkg_version: 1.26.0-00
kubernetes_container_runtime: docker
kubernetes_standalone_max_pods: 42
diff --git a/inventory/host_vars/ele-coturn.yml b/inventory/host_vars/ele-coturn.yml
index e89332be..28314433 100644
--- a/inventory/host_vars/ele-coturn.yml
+++ b/inventory/host_vars/ele-coturn.yml
@@ -26,7 +26,7 @@ spreadspace_apt_repo_components:
acme_directory_server: "{{ acme_directory_server_le_live_v2 }}"
-kubernetes_version: 1.27.1
+kubernetes_version: 1.27.3
kubernetes_cri_tools_pkg_version: 1.26.0-00
kubernetes_container_runtime: docker
kubernetes_standalone_max_pods: 100
diff --git a/inventory/host_vars/ele-helene.yml b/inventory/host_vars/ele-helene.yml
index 81cb7f51..cb8d1490 100644
--- a/inventory/host_vars/ele-helene.yml
+++ b/inventory/host_vars/ele-helene.yml
@@ -90,7 +90,7 @@ kubelet_storage:
size: 5G
fs: ext4
-kubernetes_version: 1.27.1
+kubernetes_version: 1.27.3
kubernetes_cri_tools_pkg_version: 1.26.0-00
kubernetes_container_runtime: docker
kubernetes_standalone_max_pods: 42
diff --git a/inventory/host_vars/ele-jitsi.yml b/inventory/host_vars/ele-jitsi.yml
index f6d39579..c7520247 100644
--- a/inventory/host_vars/ele-jitsi.yml
+++ b/inventory/host_vars/ele-jitsi.yml
@@ -31,7 +31,7 @@ ssh_users_root:
acme_directory_server: "{{ acme_directory_server_le_live_v2 }}"
-kubernetes_version: 1.27.1
+kubernetes_version: 1.27.3
kubernetes_cri_tools_pkg_version: 1.26.0-00
kubernetes_container_runtime: docker
kubernetes_standalone_max_pods: 100
diff --git a/inventory/host_vars/ele-media.yml b/inventory/host_vars/ele-media.yml
index caad7634..ea5333f7 100644
--- a/inventory/host_vars/ele-media.yml
+++ b/inventory/host_vars/ele-media.yml
@@ -72,7 +72,7 @@ kubelet_storage:
size: 5G
fs: ext4
-kubernetes_version: 1.27.1
+kubernetes_version: 1.27.3
kubernetes_cri_tools_pkg_version: 1.26.0-00
kubernetes_container_runtime: docker
kubernetes_standalone_cni_variant: with-portmap
@@ -133,7 +133,7 @@ elevate_media_nextcloud_storage:
elevate_media_nextcloud_instance_name: media.elevate.at
elevate_media_nextcloud_instance:
- version: 26.0.1
+ version: 26.0.3
port: 8100
hostnames:
- media.elevate.at
@@ -143,7 +143,7 @@ elevate_media_nextcloud_instance:
password: "{{ vault_nextcloud_admin_passwords['media.elevate.at'] }}"
database:
type: mariadb
- version: 10.8.3
+ version: 10.11.4
password: "{{ vault_nextcloud_database_passwords['media.elevate.at'] }}"
elevate_media_nextcloud_memory_limit: 4G
diff --git a/inventory/host_vars/ele-thetys.yml b/inventory/host_vars/ele-thetys.yml
index bdb21bf1..e36f0f03 100644
--- a/inventory/host_vars/ele-thetys.yml
+++ b/inventory/host_vars/ele-thetys.yml
@@ -81,7 +81,7 @@ kubelet_storage:
size: 5G
fs: ext4
-kubernetes_version: 1.27.1
+kubernetes_version: 1.27.3
kubernetes_cri_tools_pkg_version: 1.26.0-00
kubernetes_container_runtime: docker
kubernetes_standalone_max_pods: 42
diff --git a/inventory/host_vars/glt-calypso.yml b/inventory/host_vars/glt-calypso.yml
index 35e1ef7d..95604096 100644
--- a/inventory/host_vars/glt-calypso.yml
+++ b/inventory/host_vars/glt-calypso.yml
@@ -57,7 +57,7 @@ kubelet_storage:
size: 10G
fs: ext4
-kubernetes_version: 1.27.1
+kubernetes_version: 1.27.3
kubernetes_cri_tools_pkg_version: 1.26.0-00
kubernetes_container_runtime: docker
kubernetes_standalone_max_pods: 42
diff --git a/inventory/host_vars/glt-coturn.yml b/inventory/host_vars/glt-coturn.yml
index df6e1215..7dbcca04 100644
--- a/inventory/host_vars/glt-coturn.yml
+++ b/inventory/host_vars/glt-coturn.yml
@@ -17,7 +17,7 @@ kubelet_storage:
spreadspace_apt_repo_components:
- container
-kubernetes_version: 1.27.1
+kubernetes_version: 1.27.3
kubernetes_cri_tools_pkg_version: 1.26.0-00
kubernetes_container_runtime: docker
kubernetes_standalone_max_pods: 100
diff --git a/inventory/host_vars/glt-meet1.yml b/inventory/host_vars/glt-meet1.yml
index 592a096d..6ce86abf 100644
--- a/inventory/host_vars/glt-meet1.yml
+++ b/inventory/host_vars/glt-meet1.yml
@@ -18,7 +18,7 @@ spreadspace_apt_repo_components:
- container
-kubernetes_version: 1.27.1
+kubernetes_version: 1.27.3
kubernetes_cri_tools_pkg_version: 1.26.0-00
kubernetes_container_runtime: docker
kubernetes_standalone_max_pods: 100
diff --git a/inventory/host_vars/glt-meet2.yml b/inventory/host_vars/glt-meet2.yml
index 1224aab2..c9093da3 100644
--- a/inventory/host_vars/glt-meet2.yml
+++ b/inventory/host_vars/glt-meet2.yml
@@ -18,7 +18,7 @@ spreadspace_apt_repo_components:
- container
-kubernetes_version: 1.27.1
+kubernetes_version: 1.27.3
kubernetes_cri_tools_pkg_version: 1.26.0-00
kubernetes_container_runtime: docker
kubernetes_standalone_max_pods: 100
diff --git a/inventory/host_vars/glt-tsdatacop.yml b/inventory/host_vars/glt-tsdatacop.yml
index 1ddbe429..2391396d 100644
--- a/inventory/host_vars/glt-tsdatacop.yml
+++ b/inventory/host_vars/glt-tsdatacop.yml
@@ -53,7 +53,7 @@ kubelet_storage:
size: 10G
fs: ext4
-kubernetes_version: 1.27.1
+kubernetes_version: 1.27.3
kubernetes_cri_tools_pkg_version: 1.26.0-00
kubernetes_container_runtime: docker
kubernetes_standalone_max_pods: 42
diff --git a/inventory/host_vars/s2-thetys.yml b/inventory/host_vars/s2-thetys.yml
index bf413157..84852b25 100644
--- a/inventory/host_vars/s2-thetys.yml
+++ b/inventory/host_vars/s2-thetys.yml
@@ -53,7 +53,7 @@ kubelet_storage:
size: 5G
fs: ext4
-kubernetes_version: 1.27.1
+kubernetes_version: 1.27.3
kubernetes_cri_tools_pkg_version: 1.26.0-00
kubernetes_container_runtime: docker
kubernetes_standalone_max_pods: 42
diff --git a/inventory/host_vars/sgg-icecast.yml b/inventory/host_vars/sgg-icecast.yml
index 6142242d..c0a08506 100644
--- a/inventory/host_vars/sgg-icecast.yml
+++ b/inventory/host_vars/sgg-icecast.yml
@@ -55,7 +55,7 @@ kubelet_storage:
size: 2G
fs: ext4
-kubernetes_version: 1.27.1
+kubernetes_version: 1.27.3
kubernetes_cri_tools_pkg_version: 1.26.0-00
kubernetes_container_runtime: docker
kubernetes_standalone_max_pods: 42
diff --git a/inventory/host_vars/sk-cloudio/nextcloud.yml b/inventory/host_vars/sk-cloudio/nextcloud.yml
index 17b38a8e..28836af7 100644
--- a/inventory/host_vars/sk-cloudio/nextcloud.yml
+++ b/inventory/host_vars/sk-cloudio/nextcloud.yml
@@ -17,6 +17,7 @@ nextcloud_instances:
database:
type: mariadb
version: 10.5.13
+ #version: 10.11.4
password: "{{ vault_nextcloud_database_passwords['wolke.elevate.at'] }}"
custom_image:
dockerfile: |
@@ -37,6 +38,7 @@ nextcloud_instances:
database:
type: mariadb
version: 10.5.13
+ #version: 10.11.4
password: "{{ vault_nextcloud_database_passwords['insomnia.skillz.biz'] }}"
nc.skillz.biz:
# new: true
@@ -49,6 +51,7 @@ nextcloud_instances:
database:
type: mariadb
version: 10.5.13
+ #version: 10.11.4
password: "{{ vault_nextcloud_database_passwords['nc.skillz.biz'] }}"
wae.elevate.at:
# new: true
@@ -61,6 +64,7 @@ nextcloud_instances:
database:
type: mariadb
version: 10.5.13
+ #version: 10.11.4
password: "{{ vault_nextcloud_database_passwords['wae.elevate.at'] }}"
wolke.elev8.at:
# new: true
diff --git a/inventory/host_vars/sk-cloudio/vars.yml b/inventory/host_vars/sk-cloudio/vars.yml
index 7e7379c6..69f68e88 100644
--- a/inventory/host_vars/sk-cloudio/vars.yml
+++ b/inventory/host_vars/sk-cloudio/vars.yml
@@ -70,7 +70,7 @@ kubelet_storage:
properties:
quota: 20G
-kubernetes_version: 1.27.1
+kubernetes_version: 1.27.3
kubernetes_cri_tools_pkg_version: 1.26.0-00
kubernetes_container_runtime: docker
kubernetes_standalone_max_pods: 100
diff --git a/inventory/host_vars/sk-tomnext-nc.yml b/inventory/host_vars/sk-tomnext-nc.yml
index e6ca7f75..87d13d77 100644
--- a/inventory/host_vars/sk-tomnext-nc.yml
+++ b/inventory/host_vars/sk-tomnext-nc.yml
@@ -88,7 +88,7 @@ kubelet_storage:
properties:
quota: 15G
-kubernetes_version: 1.27.1
+kubernetes_version: 1.27.3
kubernetes_cri_tools_pkg_version: 1.26.0-00
kubernetes_container_runtime: docker
kubernetes_standalone_max_pods: 15
@@ -126,6 +126,7 @@ nextcloud_instances:
database:
type: mariadb
version: 10.5.13
+ #version: 10.11.4
password: "{{ vault_nextcloud_database_passwords['team.tomwaitz.eu'] }}"
custom_image:
dockerfile: |
diff --git a/roles/apps/nextcloud/templates/pod-spec-with-mariadb.yml.j2 b/roles/apps/nextcloud/templates/pod-spec-with-mariadb.yml.j2
index b77ddeb2..725f84d9 100644
--- a/roles/apps/nextcloud/templates/pod-spec-with-mariadb.yml.j2
+++ b/roles/apps/nextcloud/templates/pod-spec-with-mariadb.yml.j2
@@ -44,6 +44,7 @@ containers:
image: "mariadb:{{ item.value.database.version }}"
args:
- --transaction-isolation=READ-COMMITTED
+ - --log-bin=binlog
- --binlog-format=ROW
securityContext:
runAsUser: {{ nextcloud_db_uid }}
diff --git a/roles/elevate/media/templates/nextcloud-pod-spec-with-mariadb.yml.j2 b/roles/elevate/media/templates/nextcloud-pod-spec-with-mariadb.yml.j2
index dabbf7d3..026ff7a7 100644
--- a/roles/elevate/media/templates/nextcloud-pod-spec-with-mariadb.yml.j2
+++ b/roles/elevate/media/templates/nextcloud-pod-spec-with-mariadb.yml.j2
@@ -39,6 +39,7 @@ containers:
image: "mariadb:{{ elevate_media_nextcloud_instance.database.version }}"
args:
- --transaction-isolation=READ-COMMITTED
+ - --log-bin=binlog
- --binlog-format=ROW
securityContext:
runAsUser: {{ elevate_media_nextcloud_db_uid }}
diff --git a/roles/kubernetes/base/tasks/cri_docker.yml b/roles/kubernetes/base/tasks/cri_docker.yml
index 626395b7..6d114b87 100644
--- a/roles/kubernetes/base/tasks/cri_docker.yml
+++ b/roles/kubernetes/base/tasks/cri_docker.yml
@@ -26,8 +26,8 @@
iptables: false
log-driver: "json-file"
log-opts:
- max-size: "20M"
- max-file: "3"
+ max-size: "10M"
+ max-file: "5"
- name: override mandatory settings in docker_daemon_config
set_fact: