Fix memcached conditional and external database check in init container (#18)

Bump chart version

Update README.md with example for DB

Fix external host check for Databases

Fix condition for memcached in Chart.yaml

Co-authored-by: Lucas Hahn <lucas.hahn@novum-rgi.de>
Reviewed-on: https://gitea.com/gitea/helm-chart/pulls/18
Reviewed-by: techknowlogick <techknowlogick@gitea.io>
Reviewed-by: Andrew Thornton <art27@cantab.net>
This commit is contained in:
luhahn 2020-09-03 21:27:11 +00:00 committed by techknowlogick
parent b083092b4f
commit e85e1718de
3 changed files with 24 additions and 6 deletions

View File

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

View File

@ -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. [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 ## Introduction
This helm chart has taken some inspiration from https://github.com/jfelten/gitea-helm-chart 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: repository.pull-request:
WORK_IN_PROGRESS_PREFIXES: "WIP:,[WIP]:" 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 ### Ports and external url

View File

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