fix:update helm chart for external db configs

edu-sharing · Jun 17, 2024 · ece26f2 · ece26f2
1 parent 550934a
commit ece26f2
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 18 deletions.
diff --git a/deploy/docker/helm/src/main/chart/Chart.yaml b/deploy/docker/helm/src/main/chart/Chart.yaml
@@ -3,5 +3,5 @@ apiVersion: v2
 name: edu-sharing-services-connector
 description: Helm chart for edu-sharing connector app
 type: application
-version: 8.1.9998
-appVersion: 0.1.0
+version: 8.1.2
+appVersion: 8.1.2
diff --git a/deploy/docker/helm/src/main/chart/templates/persistentvolumeclaim.yml b/deploy/docker/helm/src/main/chart/templates/persistentvolumeclaim.yml
@@ -10,4 +10,4 @@ spec:
     - ReadWriteMany
   resources:
     requests:
-      storage: "30Gi"
+      storage: {{ .Values.database.storageSize }}
diff --git a/deploy/docker/helm/src/main/chart/templates/service.yml b/deploy/docker/helm/src/main/chart/templates/service.yml
@@ -11,7 +11,7 @@ spec:
       targetPort: api
 
 ---
-
+{{- if .Values.database.enabled }}
 kind: Service
 apiVersion: v1
 metadata:
@@ -23,3 +23,4 @@ spec:
     - port: 3306
       name: tcp-db
       targetPort: db
+{{- end }}
diff --git a/deploy/docker/helm/src/main/chart/templates/statefulset.yml b/deploy/docker/helm/src/main/chart/templates/statefulset.yml
@@ -25,15 +25,15 @@ spec:
         - name: PORT_EXTERNAL
           value: "443"
         - name: DATABASE_HOST
-          value: edu-sharing-connector-db
+          value: {{ if .Values.database.enabled }}"edu-sharing-connector-db"{{ else }}{{ .Values.database.config.host }}{{ end }}
         - name: DATABASE_PORT
-          value: "3306"
+          value: {{ if .Values.database.enabled }}"3306"{{ else }}"{{ .Values.database.config.port }}"{{ end }}
         - name: DATABASE_USER
-          value: "connector"
+          value: {{ if .Values.database.enabled }}"connector"{{ else }}{{ .Values.database.config.username }}{{ end }}
         - name: DATABASE_NAME
-          value: "connector"
+          value: {{ if .Values.database.enabled }}"connector"{{ else }}{{ .Values.database.config.database }}{{ end }}
         - name: DATABASE_PASSWORD
-          value: {{ required "A valid .Values.passwordDB is required!" .Values.passwordDB }}
+          value: {{ if .Values.database.enabled }}{{required "A valid .Values.passwordDB is required!" .Values.passwordDB}}{{ else }}{{ .Values.database.config.password }}{{ end }}
         - name: ONLYOFFICE_DOCUMENT_SERVER
           value: {{ .Values.onlyofficeDocumentServer | default "" }}
         - name: ONLYOFFICE_PLUGIN_URL
@@ -65,13 +65,9 @@ spec:
           periodSeconds: 10
           successThreshold: 1
           timeoutSeconds: 10
-        resources:
-          limits:
-            cpu: "4000m"
-            memory: "4Gi"
-          requests:
-            cpu: "500m"
-            memory: "4Gi"
+        {{- with .Values.resources }}
+        resources: {{ toYaml . | nindent 10 }}
+        {{- end }}
         ports:
         - containerPort: 80
           name: api
@@ -84,7 +80,7 @@ spec:
           claimName: edu-sharing-services-connector-data
 
 ---
-
+{{- if .Values.database.enabled }}
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
@@ -136,3 +132,4 @@ spec:
       resources:
         requests:
           storage: "16Gi"
+{{ end }}
diff --git a/deploy/docker/helm/src/main/chart/values.yaml b/deploy/docker/helm/src/main/chart/values.yaml
@@ -1,4 +1,14 @@
 baseUrl: 
 storageClassName:
 clusterIssuer: letsencrypt
-version: maven-fixes-8.1-SNAPSHOT
+version: 8.1.2
+database:
+  storageSize: 30Gi
+  enabled: true
+  # when enabled = false for external database
+  config:
+     host: "???"
+     port: "???"
+     database: "???"
+     username: "???"
+     password: "???"