feat: allow to change db type and port when using external db

zzorica · May 17, 2024 · 9480990 · 9480990
1 parent 14fffab
commit 9480990
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 10 deletions.
diff --git a/charts/freescout/Chart.yaml b/charts/freescout/Chart.yaml
@@ -18,13 +18,13 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.14
+version: 0.2.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: 'php8.2-1.17.32'
+appVersion: "php8.2-1.17.72"
 dependencies:
   - name: mariadb
     version: ~11.x

diff --git a/charts/freescout/templates/deployment.yaml b/charts/freescout/templates/deployment.yaml
@@ -85,10 +85,12 @@ spec:
                 key: "mariadb-password"
           {{- end }}
           {{- else }}
+          - name: DB_TYPE
+            value: {{ .Values.externalDatabase.type | quote }}
           - name: DB_HOST
             value: {{ .Values.externalDatabase.host | quote }}
           - name: DB_PORT
-            value: "3306"
+            value: {{ .Values.externalDatabase.port | quote }}
           - name: DB_NAME
             value: {{ .Values.externalDatabase.database | quote }}
           - name: DB_USER

diff --git a/charts/freescout/values.yaml b/charts/freescout/values.yaml
@@ -25,10 +25,12 @@ serviceAccount:
 
 podAnnotations: {}
 
-podSecurityContext: {}
+podSecurityContext:
+  {}
   # fsGroup: 2000
 
-securityContext: {}
+securityContext:
+  {}
   # capabilities:
   #   drop:
   #   - ALL
@@ -43,7 +45,8 @@ service:
 ingress:
   enabled: false
   className: ""
-  annotations: {}
+  annotations:
+    {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
   hosts:
@@ -56,7 +59,8 @@ ingress:
   #    hosts:
   #      - chart-example.local
 
-resources: {}
+resources:
+  {}
   # We usually recommend not to specify default resources and to leave this as a conscious
   # choice for the user. This also increases chances charts run on environments with little
   # resources, such as Minikube. If you do want to specify resources, uncomment the following
@@ -106,7 +110,7 @@ freescout:
   # If using SSL reverse proxy force application to return https URLs TRUE or FALSE
   enable_ssl_proxy: false
   # The url your site listens on example https://freescout.example.com
-  site_url:  # http://freescout:80
+  site_url: # http://freescout:80
 
 persistence:
   enabled: false
@@ -133,9 +137,12 @@ persistence:
 ##
 externalDatabase:
   enabled: false
-
+  ## Database type. Allowed values: mysql or pgsql
+  type: mysql
   ## Database host
   host:
+  ## Database port
+  port: 3306
   ## Database name
   database: freescout
   ## Database user
@@ -179,7 +186,8 @@ mariadb:
       accessMode: ReadWriteOnce
       size: 8Gi
 
-    resources: {}
+    resources:
+      {}
       # We usually recommend not to specify default resources and to leave this as a conscious
       # choice for the user. This also increases chances charts run on environments with little
       # resources, such as Minikube. If you do want to specify resources, uncomment the following