allow for additional container environment variables (#16)

Co-authored-by: Jasper Orschulko <Jasper.Orschulko@irisgmbh.de>
Reviewed-on: https://gitea.com/gitea/helm-chart/pulls/16
Reviewed-by: luhahn <luhahn@noreply.gitea.io>
Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com>

Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: gitea
 description: Gitea Helm chart for Kubernetes
 type: application
-version: 1.4.2
-appVersion: 1.12.3
+version: 1.4.5
+appVersion: 1.12.4
 icon: https://docs.gitea.io/images/gitea.png
 
 keywords:
@@ -30,7 +30,7 @@ dependencies:
 - name: memcached
   repository: https://charts.bitnami.com/bitnami
   version: 4.2.20
-  condition: gitea.cache.enabled
+  condition: gitea.cache.builtIn.enabled
 - name: mysql
   repository: https://charts.bitnami.com/bitnami
   version: 6.14.8

README.md

@@ -2,8 +2,6 @@
 
 [Gitea](https://gitea.io/en-us/) is a community managed lightweight code hosting solution written in Go. It is published under the MIT license.
 
-Readme will be updated with examples in the next few days
-
 ## Introduction
 
 This helm chart has taken some inspiration from https://github.com/jfelten/gitea-helm-chart
@@ -49,6 +47,26 @@ Gitea offers lots of configuration. This is fully described in the [Gitea Cheat
       repository.pull-request:
         WORK_IN_PROGRESS_PREFIXES: "WIP:,[WIP]:"
 ```
+### External Database
+
+An external Database can be used instead of builtIn postgresql or mysql.
+
+```yaml
+  gitea:
+    database:
+      builtIn:
+        postgresql:
+          enabled: false
+
+    config:
+      database:
+        DB_TYPE: mysql
+        HOST: 127.0.0.1:3306
+        NAME: gitea
+        USER: root
+        PASSWD: gitea
+      SCHEMA: gitea
+```
 
 ### Ports and external url
 
@@ -164,6 +182,7 @@ Like the admin user the ldap settings can be updated but also disabled or delete
 | Parameter           | Description                       | Default                      |
 |---------------------|-----------------------------------|------------------------------|
 |statefulset.terminationGracePeriodSeconds| Image to start for this pod | gitea/gitea |
+|statefulset.env           | Additional environment variables to pass to containers | [] |
 
 
 ### Image
@@ -171,7 +190,7 @@ Like the admin user the ldap settings can be updated but also disabled or delete
 | Parameter           | Description                       | Default                      |
 |---------------------|-----------------------------------|------------------------------|
 |image.repository| Image to start for this pod | gitea/gitea |
-|image.version| Image Version | 1.12.2 |
+|image.version| Image Version | 1.12.4 |
 |image.pullPolicy| Image pull policy | Always |
 
 ### Persistence

templates/_helpers.tpl

@@ -61,7 +61,8 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 {{- else if .Values.gitea.database.builtIn.mysql.enabled -}}
 {{- printf "%s-mysql" .Release.Name -}}
 {{- else -}}
-{{ .Values.gitea.database.external.host }}
+{{- $parts := split ":" .Values.gitea.config.database.HOST -}}
+{{- printf "%s %s" $parts._0 $parts._1 -}}
 {{- end -}}
 {{- end -}}
 
@@ -71,7 +72,6 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 {{- else if .Values.gitea.database.builtIn.mysql.enabled -}}
 {{ .Values.mysql.service.port }}
 {{- else -}}
-{{ .Values.gitea.database.external.port }}
 {{- end -}}
 {{- end -}}
 

templates/gitea/statefulset.yaml

@@ -87,6 +87,10 @@ spec:
               value: {{ .Values.gitea.config.server.SSH_LISTEN_PORT | quote }}
             - name: SSH_PORT
               value: {{ .Values.gitea.config.server.SSH_PORT | quote }}
+            {{- range .Values.statefulset.env }}
+            - name: {{ .name | quote | nospace }}
+              value: {{ .value | quote }}
+            {{- end }}
           ports:
             - name: ssh
               containerPort: {{ .Values.gitea.config.server.SSH_LISTEN_PORT }}

values.yaml

@@ -6,7 +6,7 @@ replicaCount: 1
 
 image:
   repository: gitea/gitea
-  version: 1.12.3
+  version: 1.12.4
   pullPolicy: Always
 
 imagePullSecrets: []
@@ -55,6 +55,9 @@ tolerations: []
 affinity: {}
 
 statefulset:
+  env: []
+    # - name: VARIABLE
+    #   value: my-value
   terminationGracePeriodSeconds: 60
 
 persistence: