From b1379db69364e18c5a2c129a2c86526727fbb106 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sun, 4 Jul 2021 19:39:33 +0200
Subject: [PATCH] Tryout adding HPB sidecart to nextcloud (#655)

* tryout adding HPB sidecart

* env array

* no need to encode a configmap and add service

* no message

* allow some more dns names

* try adding a wait to the hpb container if hpb doesn't exist

* fix quotes

* hmm

* cleaner command

* try again

* spaces bracets

* try syntaxis change

* typo

* try some polish
---
 charts/develop/nextcloud/Chart.yaml           |  2 +-
 .../nextcloud/templates/_configmap.tpl        | 10 +++++-
 charts/develop/nextcloud/values.yaml          | 33 +++++++++++++++++++
 3 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/charts/develop/nextcloud/Chart.yaml b/charts/develop/nextcloud/Chart.yaml
index d657fa1f50c..ae5730b7fed 100644
--- a/charts/develop/nextcloud/Chart.yaml
+++ b/charts/develop/nextcloud/Chart.yaml
@@ -35,4 +35,4 @@ sources:
 - https://github.com/nextcloud/docker
 - https://github.com/nextcloud/helm
 type: application
-version: 1.0.20
+version: 1.0.21
diff --git a/charts/develop/nextcloud/templates/_configmap.tpl b/charts/develop/nextcloud/templates/_configmap.tpl
index 1569e5a3009..aa6473aaf29 100644
--- a/charts/develop/nextcloud/templates/_configmap.tpl
+++ b/charts/develop/nextcloud/templates/_configmap.tpl
@@ -17,9 +17,17 @@ kind: ConfigMap
 metadata:
   name: nextcloudconfig
 data:
-  NEXTCLOUD_TRUSTED_DOMAINS: {{ ( printf "%v %v %v" "test.fakedomain.dns" ( .Values.env.NODE_IP | default "localhost" ) $hosts ) | quote }}
+  NEXTCLOUD_TRUSTED_DOMAINS: {{ ( printf "%v %v %v %v %v" "test.fakedomain.dns" ( .Values.env.NODE_IP | default "localhost" ) ( printf "%v-%v" .Release.Name "nextcloud" ) ( printf "%v-%v" .Release.Name "nextcloud-hpb" ) $hosts ) | quote }}
   {{- if .Values.ingress.main.enabled }}
   APACHE_DISABLE_REWRITE_IP: "1"
   {{- end }}
 
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: hpbconfig
+data:
+  NEXTCLOUD_URL: {{ ( printf "%v-%v" .Release.Name "nextcloud" ) | quote }}
+
 {{- end -}}
diff --git a/charts/develop/nextcloud/values.yaml b/charts/develop/nextcloud/values.yaml
index fca981ea226..9f10f6e404c 100644
--- a/charts/develop/nextcloud/values.yaml
+++ b/charts/develop/nextcloud/values.yaml
@@ -13,6 +13,12 @@ service:
     ports:
       main:
         port: 80
+  hpb:
+    enabled: true
+    ports:
+      hpb:
+        enabled: true
+        port: 7867
 
 env:
   NEXTCLOUD_ADMIN_USER: "admin"
@@ -84,6 +90,33 @@ initContainers:
             name: dbcreds
             key: plainhost
 
+additionalContainers:
+- name: hpb
+  image: nextcloud:21.0.2
+  imagePullPolicy: IfNotPresent
+  command:
+  - "/bin/bash"
+  - "-c"
+  - "--"
+  args:
+  - 'while [ ! -f "/var/www/html/custom_apps/notify_push/bin/x86_64/notify_push" ]; do sleep 30; echo "notify_push not found, waiting"; done && /var/www/html/custom_apps/notify_push/bin/x86_64/notify_push /var/www/html/config/config.php'
+  env:
+    - name: PORT
+      value: "7867"
+  envFrom:
+    - configMapRef:
+        name: hpbconfig
+  ports:
+    - name: hpb
+      containerPort: 7867
+  volumeMounts:
+    - mountPath: /var/www/html
+      name: data
+  securityContext:
+    runAsUser: 33
+    runAsGroup: 33
+
+
 podSecurityContext:
   fsGroup: 33