From 2652b2645d93106b9d6a3e50e35c9e2bd07bee12 Mon Sep 17 00:00:00 2001
From: Dominik Kaminski <kaminski@univention.de>
Date: Fri, 4 Aug 2023 14:30:11 +0200
Subject: [PATCH] fix(collabora): Bump to 23.05.2.2.1 and add capabilites to
 non containerd k8s clusters

---
 helmfile/apps/collabora/values.gotmpl        | 9 +++++++++
 helmfile/apps/collabora/values.yaml          | 8 --------
 helmfile/environments/default/cluster.gotmpl | 4 ++++
 helmfile/environments/default/images.gotmpl  | 4 ++--
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/helmfile/apps/collabora/values.gotmpl b/helmfile/apps/collabora/values.gotmpl
index 1a67d1b4..9a42fb50 100644
--- a/helmfile/apps/collabora/values.gotmpl
+++ b/helmfile/apps/collabora/values.gotmpl
@@ -32,5 +32,14 @@ collabora:
   aliasgroups:
     - host: "https://{{ .Values.global.hosts.nextcloud }}.{{ .Values.global.domain }}:443"
 
+{{- if not (eq .Values.cluster.container.engine "containerd") }}
+# In case of issues with "Failed to exec command '/usr/bin/loolforkit' (EPERM: Operation not permitted)...", activate:
+# Ref.: https://github.com/CollaboraOnline/online/issues/2800
+securityContext:
+  capabilities:
+    add:
+      - "MKNOD"
+{{- end }}
+
 replicaCount: {{ .Values.replicas.collabora }}
 ...
diff --git a/helmfile/apps/collabora/values.yaml b/helmfile/apps/collabora/values.yaml
index bc034445..ebb1ce61 100644
--- a/helmfile/apps/collabora/values.yaml
+++ b/helmfile/apps/collabora/values.yaml
@@ -12,14 +12,6 @@ image:
 collabora:
   extra_params: "--o:ssl.enable=false --o:ssl.termination=true"
 
-
-# In case of issues with "Failed to exec command '/usr/bin/loolforkit' (EPERM: Operation not permitted)...", activate:
-# Ref.: https://github.com/CollaboraOnline/online/issues/2800
-# securityContext:
-#   capabilities:
-#     add:
-#       - "MKNOD"
-
 ingress:
   annotations:
     # nginx
diff --git a/helmfile/environments/default/cluster.gotmpl b/helmfile/environments/default/cluster.gotmpl
index b5456cd3..685c9fd7 100644
--- a/helmfile/environments/default/cluster.gotmpl
+++ b/helmfile/environments/default/cluster.gotmpl
@@ -19,4 +19,8 @@ cluster:
     domain: "cluster.local"
     # Kubernetes cluster network CIDR.
     cidr: "10.0.0.0/8"
+
+  container:
+    # Used container engine in kubernetes cluster.
+    engine: "cri-o"
 ...
diff --git a/helmfile/environments/default/images.gotmpl b/helmfile/environments/default/images.gotmpl
index 4a358ae0..1aa23237 100644
--- a/helmfile/environments/default/images.gotmpl
+++ b/helmfile/environments/default/images.gotmpl
@@ -8,8 +8,8 @@ images:
     repository: "clamav/clamav"
     tag: "1.1.0_base"
   collabora:
-    repository: "souvap/tooling/images/collabora"
-    tag: "23.05.1.2.2"
+    repository: "collabora/code"
+    tag: "23.05.2.2.1"
   dovecot:
     repository: "dovecot/dovecot"
     tag: "2.3.20"