fix(charts/cryptpad): Remove whitespaces in url variables (#26)

cryptpad · Jan 25, 2024 · fdab7a1 · fdab7a1
1 parent 93a8b2f
commit fdab7a1
Show file tree

Hide file tree

Showing 3 changed files with 107 additions and 108 deletions.
diff --git a/charts/cryptpad/templates/_helpers.tpl b/charts/cryptpad/templates/_helpers.tpl
@@ -62,27 +62,27 @@ Create the name of the service account to use
 {{- end }}
 
 {{/*
-Define main domain. Or use first ingress host defined as main domain. 
+Define main domain. Or use first ingress host defined as main domain.
 */}}
 {{- define "cryptpad-helm.mainDomain" -}}
 {{- if .Values.ingress.enabled }}
 https://{{ (index .Values.ingress.hosts 0).host }}
-{{- else if .Values.config.httpUnsafeOrigin }}  
+{{- else if .Values.config.httpUnsafeOrigin }}
 {{- .Values.config.httpUnsafeOrigin }}
 {{- else }}
 http://localhost:3000
-{{- end}}
+{{- end }}
 {{- end }}
 
 {{/*
-Define sandbox subdomain. Or use first ingress host defined as main domain. 
+Define sandbox subdomain. Or use first ingress host defined as main domain.
 */}}
 {{- define "cryptpad-helm.sandboxDomain" -}}
 {{- if .Values.ingress.enabled }}
 https://{{ (index .Values.ingress.hosts 0).host }}
-{{- else if .Values.config.httpSafeOrigin }}  
+{{- else if .Values.config.httpSafeOrigin }}
 {{- .Values.config.httpSafeOrigin }}
 {{- else }}
 http://localhost:3000
-{{- end}}
+{{- end }}
 {{- end }}
diff --git a/charts/cryptpad/templates/cryptpad.yaml b/charts/cryptpad/templates/cryptpad.yaml
@@ -37,44 +37,43 @@ spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       initContainers:
-      - name: init-{{ .Chart.Name }}
-        securityContext:
-          {{- toYaml .Values.securityContext | nindent 12 }}
-        image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-        imagePullPolicy: {{ .Values.image.pullPolicy }}
-        command: ['/bin/sh', '-c']
-        volumeMounts:
-          - name: cryptpad-data
-            mountPath: /cryptpad/data
-            {{- if and .Values.persistence .Values.persistence.cryptpad.data.existingClaim }}
-              persistentVolumeClaim:
-                claimName: {{ tpl .Values.persistence.cryptpad.data.existingClaim $ }}
-            {{- end }}
-        args:
-        - |
-          FILE=/cryptpad/data/decrees/decree.ndjson
-          mkdir -p /cryptpad/data/decrees
-          VALUE='["ENABLE_EMBEDDING", [{{ .Values.enableEmbedding }}], "", 0]'
-          if  [ -f $FILE ] && [ $(grep -c "ENABLE_EMBEDDING" $FILE) -gt 0 ]
-          then
-            sed -i "s|.*ENABLE_EMBEDDING.*|$VALUE|g" "$FILE"
-          else           
-            echo "$VALUE" >> "$FILE"
-          fi
-
+        - name: init-{{ .Chart.Name }}
+          securityContext:
+            {{- toYaml .Values.securityContext | nindent 12 }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          command: ['/bin/sh', '-c']
+          volumeMounts:
+            - name: cryptpad-data
+              mountPath: /cryptpad/data
+              {{- if and .Values.persistence .Values.persistence.cryptpad.data.existingClaim }}
+                persistentVolumeClaim:
+                  claimName: {{ tpl .Values.persistence.cryptpad.data.existingClaim $ }}
+              {{- end }}
+          args:
+            - |
+              FILE=/cryptpad/data/decrees/decree.ndjson
+              mkdir -p /cryptpad/data/decrees
+              VALUE='["ENABLE_EMBEDDING", [{{ .Values.enableEmbedding }}], "", 0]'
+              if  [ -f $FILE ] && [ $(grep -c "ENABLE_EMBEDDING" $FILE) -gt 0 ]
+              then
+                sed -i "s|.*ENABLE_EMBEDDING.*|$VALUE|g" "$FILE"
+              else
+                echo "$VALUE" >> "$FILE"
+              fi
       containers:
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
-          - name: CPAD_MAIN_DOMAIN       
-            value: "{{ include "cryptpad-helm.mainDomain" . }}"
-          - name: CPAD_SANDBOX_DOMAIN
-            value: "{{ include "cryptpad-helm.sandboxDomain" . }}"
-          - name: CPAD_CONF
-            value: "{{ .Values.cpadConfig }}"
+            - name: CPAD_MAIN_DOMAIN
+              value: "{{ include "cryptpad-helm.mainDomain" . | trim }}"
+            - name: CPAD_SANDBOX_DOMAIN
+              value: "{{ include "cryptpad-helm.sandboxDomain" . | trim }}"
+            - name: CPAD_CONF
+              value: "{{ .Values.cpadConfig }}"
           ports:
             - name: {{ .Values.service.internalPort }}
               containerPort: {{ .Values.service.containerPort }}
@@ -135,25 +134,25 @@ spec:
           volumeMounts:
           {{- if .Values.persistence.enabled }}
           {{- range $dir, $dirvalues := .Values.persistence.cryptpad }}
-          - name: cryptpad-{{ $dir }}
-            mountPath: /cryptpad/{{ $dir }}
-            {{- if $dirvalues.existingClaim }}
-              persistentVolumeClaim:
-                claimName: {{ tpl $dirvalues.existingClaim $ }}
-            {{- end }}
+            - name: cryptpad-{{ $dir }}
+              mountPath: /cryptpad/{{ $dir }}
+              {{- if $dirvalues.existingClaim }}
+                persistentVolumeClaim:
+                  claimName: {{ tpl $dirvalues.existingClaim $ }}
+              {{- end }}
           {{- end }}
           {{- else if not .Values.workloadStateful }}
           {{- range $dir, $dirvalues := .Values.persistence.cryptpad }}
-          - name: cryptpad-{{ $dir }}
-            mountPath: /cryptpad/{{ $dir }}
+            - name: cryptpad-{{ $dir }}
+              mountPath: /cryptpad/{{ $dir }}
           {{- end }}
           {{- end }}
-          - name: configmaps
-            mountPath: {{ .Values.cpadConfig }}
-            subPath: config.js
-          - name: configmaps
-            mountPath: /cryptpad/customize/application_config.js
-            subPath: application_config.js
+            - name: configmaps
+              mountPath: {{ .Values.cpadConfig }}
+              subPath: config.js
+            - name: configmaps
+              mountPath: /cryptpad/customize/application_config.js
+              subPath: application_config.js
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
@@ -167,60 +166,60 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       volumes:
-      - name: configmaps
-        configMap:
-          name: {{ include "cryptpad-helm.fullname" . }}
-{{- if and .Values.persistence.enabled .Values.workloadStateful}}
-      {{- range $dir, $dirvalues := .Values.persistence.cryptpad }}
-      {{- if $dirvalues.existingClaim }}
-      - name: cryptpad-{{ $dir }}
+        - name: configmaps
+          configMap:
+            name: {{ include "cryptpad-helm.fullname" . }}
+        {{- if and .Values.persistence.enabled .Values.workloadStateful }}
+        {{- range $dir, $dirvalues := .Values.persistence.cryptpad }}
+        {{- if $dirvalues.existingClaim }}
+        - name: cryptpad-{{ $dir }}
           persistentVolumeClaim:
             claimName: cryptpad-{{ $dir }}
+        {{- end }}
+        {{- end }}
+    volumeClaimTemplates:
+      {{- range $dir, $dirvalues := .Values.persistence.cryptpad }}
+      {{- if not $dirvalues.existingClaim }}
+      - metadata:
+          name: cryptpad-{{ $dir }}
+          {{- with $dirvalues.annotations }}
+          annotations:
+            {{- toYaml . | nindent 10 }}
+          {{- end }}
+          {{- with $dirvalues.labels }}
+          labels:
+            {{- toYaml . | nindent 10 }}
+          {{- end }}
+        spec:
+          accessModes:
+          {{- range $dirvalues.accessModes }}
+            - {{ . | quote }}
+          {{- end }}
+          {{- if $dirvalues.storageClass }}
+          storageClassName:  {{ $dirvalues.storageClass | quote }}
+          {{- end }}
+          {{- with $dirvalues.dataSource }}
+          dataSource:
+            {{- toYaml . | nindent 10 }}
+          {{- end }}
+          resources:
+            requests:
+              storage: {{ $dirvalues.size | quote }}
+          {{- with $dirvalues.selector }}
+          selector:
+            {{- toYaml . | nindent 10 }}
+          {{- end }}
       {{- end }}
       {{- end }}
-  volumeClaimTemplates:
+  {{- else if .Values.persistence.enabled }}
     {{- range $dir, $dirvalues := .Values.persistence.cryptpad }}
-    {{- if not $dirvalues.existingClaim }}
-    - metadata:
-        name: cryptpad-{{ $dir }}
-        {{- with $dirvalues.annotations }}
-        annotations:
-          {{- toYaml . | nindent 10 }}
-        {{- end }}
-        {{- with $dirvalues.labels }}
-        labels:
-          {{- toYaml . | nindent 10 }}
-        {{- end }}
-      spec:
-        accessModes:
-        {{- range $dirvalues.accessModes }}
-          - {{ . | quote }}
-        {{- end }}
-        {{- if $dirvalues.storageClass }}
-        storageClassName:  {{ $dirvalues.storageClass | quote }}
-        {{- end }}
-        {{- with $dirvalues.dataSource }}
-        dataSource: 
-          {{- toYaml . | nindent 10 }}
-        {{- end }}
-        resources:
-          requests:
-            storage: {{ $dirvalues.size | quote }}
-        {{- with $dirvalues.selector }}
-        selector: 
-          {{- toYaml . | nindent 10 }}
-        {{- end }}
-    {{- end }}
+        - name: cryptpad-{{ $dir }}
+          persistentVolumeClaim:
+            claimName: cryptpad-{{ $dir }}
     {{- end }}
-{{- else if .Values.persistence.enabled }}
-  {{- range $dir, $dirvalues := .Values.persistence.cryptpad }}
-      - name: cryptpad-{{ $dir }}
-        persistentVolumeClaim:
-          claimName: cryptpad-{{ $dir }}
-  {{- end }}
-{{- else }}
-  {{- range $dir, $dirvalues := .Values.persistence.cryptpad }}
-      - name: cryptpad-{{ $dir }}
-        emptyDir: {}
+  {{- else }}
+    {{- range $dir, $dirvalues := .Values.persistence.cryptpad }}
+        - name: cryptpad-{{ $dir }}
+          emptyDir: {}
   {{- end }}
 {{- end }}
diff --git a/charts/cryptpad/templates/service.yaml b/charts/cryptpad/templates/service.yaml
@@ -13,14 +13,14 @@ spec:
     {{- end }}
   {{- end }}
   ports:
-  - port: {{ .Values.service.externalPort }}
-    targetPort: {{ .Values.service.internalPort }}
-    protocol: TCP
-    name: {{ .Values.service.name }}
-  - port: {{ .Values.service.websocket.externalPort }}
-    targetPort: {{ .Values.service.websocket.internalPort }}
-    protocol: TCP
-    name: {{ .Values.service.websocket.internalPort }}
+    - port: {{ .Values.service.externalPort }}
+      targetPort: {{ .Values.service.internalPort }}
+      protocol: TCP
+      name: {{ .Values.service.name }}
+    - port: {{ .Values.service.websocket.externalPort }}
+      targetPort: {{ .Values.service.websocket.internalPort }}
+      protocol: TCP
+      name: {{ .Values.service.websocket.internalPort }}
   sessionAffinity: {{ .Values.service.sessionAffinity }}
   selector:
     {{- include "cryptpad-helm.selectorLabels" . | nindent 4 }}