Merge branch 'master' of code.ungleich.ch:ungleich-public/ungleich-k8s
This commit is contained in:
commit
a5154fc6fd
2 changed files with 3 additions and 12 deletions
|
@ -15,7 +15,7 @@ type: application
|
||||||
# This is the chart version. This version number should be incremented each time you make changes
|
# 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.
|
# to the chart and its templates, including the app version.
|
||||||
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
||||||
version: 0.1.10
|
version: 0.2.0
|
||||||
|
|
||||||
# This is the version number of the application being deployed. This version number should be
|
# 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
|
# incremented each time you make changes to the application. Versions are not expected to
|
||||||
|
|
|
@ -24,17 +24,6 @@ spec:
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: etcletsencrypt
|
- name: etcletsencrypt
|
||||||
mountPath: "/etc/letsencrypt"
|
mountPath: "/etc/letsencrypt"
|
||||||
# This does not work: the running postgres will block this
|
|
||||||
# init container to work (mount) the volume again
|
|
||||||
# - name: remove-lost-found
|
|
||||||
# image: busybox
|
|
||||||
# command:
|
|
||||||
# - sh
|
|
||||||
# - -c
|
|
||||||
# - test -d /data/lost+found && rmdir /data/lost+found || exit 0
|
|
||||||
# volumeMounts:
|
|
||||||
# - name: postgres-data
|
|
||||||
# mountPath: "/data"
|
|
||||||
containers:
|
containers:
|
||||||
# This container will only start *after* the cert has been placed
|
# This container will only start *after* the cert has been placed
|
||||||
- name: nginx
|
- name: nginx
|
||||||
|
@ -53,9 +42,11 @@ spec:
|
||||||
envFrom:
|
envFrom:
|
||||||
- configMapRef:
|
- configMapRef:
|
||||||
name: {{ tpl .Values.identifier . }}-postgres-config
|
name: {{ tpl .Values.identifier . }}-postgres-config
|
||||||
|
# Use subpath to avoid lost+found error
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: postgres-data
|
- name: postgres-data
|
||||||
mountPath: "/var/lib/postgresql/data"
|
mountPath: "/var/lib/postgresql/data"
|
||||||
|
subPath: postgres
|
||||||
- name: gitea
|
- name: gitea
|
||||||
image: gitea/gitea:1.14
|
image: gitea/gitea:1.14
|
||||||
ports:
|
ports:
|
||||||
|
|
Loading…
Reference in a new issue