From b3a2ea30f8804980e2ad4843f6816d4e724ca552 Mon Sep 17 00:00:00 2001
From: sonicaj <waqarsonic1@gmail.com>
Date: Fri, 10 Sep 2021 18:54:53 +0500
Subject: [PATCH] Allow configuring extra storage mounts for collabora

---
 test/collabora/1.0.0/questions.yaml            |  2 +-
 test/collabora/1.0.0/templates/deployment.yaml | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/test/collabora/1.0.0/questions.yaml b/test/collabora/1.0.0/questions.yaml
index d2e2e71a7b..9e118e0e7a 100644
--- a/test/collabora/1.0.0/questions.yaml
+++ b/test/collabora/1.0.0/questions.yaml
@@ -13,7 +13,7 @@ portals:
     host:
       - "www.truepool.io"
     ports:
-      - "443"
+      - "9980"
     path: "/kb/truepool-docker-image/"
 
 questions:
diff --git a/test/collabora/1.0.0/templates/deployment.yaml b/test/collabora/1.0.0/templates/deployment.yaml
index 83eb2a02c6..afd80414f2 100644
--- a/test/collabora/1.0.0/templates/deployment.yaml
+++ b/test/collabora/1.0.0/templates/deployment.yaml
@@ -13,28 +13,29 @@ spec:
       name: {{ template "common.names.fullname" . }}
       labels: {{ include "common.labels.selectorLabels" . | nindent 8 }}
     spec:
-      # FIXME: Let's please remove hostnetwork when upstream hostport issue is sorted out with kube-router
-      hostNetwork: true
       containers:
         - name: {{ .Chart.Name }}
           {{ include "common.containers.imageConfig" .Values.image | nindent 10 }}
-          volumeMounts: {{ include "common.storage.configureAppVolumeMountsInContainer" .Values | nindent 12 }}
+          {{ if .Values.extraAppVolumeMounts }}
+          volumeMounts:
           {{ range $index, $hostPathConfiguration := .Values.extraAppVolumeMounts }}
             - name: extrappvolume-{{ $index }}
               mountPath: {{ $hostPathConfiguration.mountPath }}
           {{ end }}
+          {{ end }}
           ports:
             - name: chia-network
               protocol: TCP
-              containerPort: 8444
-              hostPort: 8444
+              containerPort: 9980
           {{ $envList := (default list .Values.environmentVariables) }}
           {{ $envList = mustAppend $envList (dict "name" "keys" "value" "/plots/keyfile") }}
           {{ $envList = mustAppend $envList (dict "name" "farmr" "value" $.Values.farmr_env) }}
           {{ include "common.containers.allEnvironmentVariables" (dict "environmentVariables" $envList) | nindent 10 }}
-      volumes: {{ include "common.storage.configureAppVolumes" .Values | nindent 8 }}
+      {{ if .Values.extraAppVolumeMounts }}
+      volumes:
       {{ range $index, $hostPathConfiguration := .Values.extraAppVolumeMounts }}
         - name: extrappvolume-{{ $index }}
           hostPath:
             path: {{ $hostPathConfiguration.hostPath }}
       {{ end }}
+      {{ end }}