Skip to content

Make Backend configuration more flexible #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions backend/duo-backend/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ spec:
port: http
resources:
{{- toYaml .Values.resources | nindent 12 }}
volumeMounts:
- name: uploads
mountPath: /home/node/app/uploads/
{{- with .Values.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
Expand All @@ -65,3 +68,11 @@ spec:
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
volumes:
- name: uploads
{{- if .Values.persistence.enabled }}
persistentVolumeClaim:
claimName: {{ include "duo-backend.fullname" . }}
{{- else }}
emptyDir: {}
{{- end }}
17 changes: 17 additions & 0 deletions backend/duo-backend/templates/pvc.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{{- if .Values.persistence.enabled }}
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: "{{ include "duo-backend.fullname" . }}"
labels:
{{- include "duo-backend.labels" . | nindent 4 }}
spec:
accessModes:
- {{ required ".Values.persistence.accessMode must be set" .Values.persistence.accessMode }}
resources:
requests:
storage: {{ required ".Values.persistence.size must be set" .Values.persistence.size }}
{{- with .Values.persistence.storageClassName }}
storageClassName: {{ . }}
{{- end }}
{{- end }}
21 changes: 15 additions & 6 deletions backend/duo-backend/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ image:
tag: develop
pullPolicy: Always

env:
- name: DATABASE_URL
valueFrom:
secretKeyRef:
name: duo-db-svcbind-custom-user
key: uri
env: []
# - name: DATABASE_URL
# valueFrom:
# secretKeyRef:
# name: duo-db-svcbind-custom-user
# key: uri

envFrom: {}

Expand Down Expand Up @@ -57,6 +57,15 @@ ingress:

resources: {}

# -- Backend component needs a storage for Uploads.
persistence:
# -- If false, an EmptyDir is used.
enabled: false
size: ""
storageClassName: ""
# Should be ReadWriteMany, unless only one Pod is deployed.
accessMode: ReadWriteMany

nodeSelector: {}

tolerations: []
Expand Down
2 changes: 2 additions & 0 deletions user-office-app/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
charts/
Chart.lock
1 change: 1 addition & 0 deletions user-office-app/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ dependencies:
repository: https://charts.bitnami.com/bitnami
version: 15.5.11
alias: duo-db
condition: duo-db.enabled
- name: duo-scheduler-backend
condition: scheduler.enabled
version: 0.1.0
Expand Down
3 changes: 3 additions & 0 deletions user-office-app/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ duo-factory:
fullnameOverride: duo-factory

duo-db:
# If disabled, database configuration for external Postgresql should be
# provided via .duo-backend.env environment.
enabled: true
fullnameOverride: duo-db
serviceBindings:
enabled: true
Expand Down