Skip to content

Commit d391b46

Browse files
authored
Update helm charts for use with db in different namespace (#83)
1 parent c8fcb70 commit d391b46

File tree

4 files changed

+7
-2
lines changed

4 files changed

+7
-2
lines changed

Charts/web-conexs/templates/api_deployment.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ spec:
1313
labels:
1414
app: {{ include "web-conexs.fullname" . }}-api
1515
spec:
16+
securityContext:
17+
runAsUser: 1000
1618
volumes:
1719
- name: data-pv-volume
1820
persistentVolumeClaim:
@@ -36,7 +38,7 @@ spec:
3638
name: {{.Values.database.passwordSecretName}}
3739
key: passwords
3840
- name: POSTGRESURL
39-
value: {{ .Values.database.protocol }}://{{ .Values.database.username }}:$(POSTGRESS_PASSWORD)@{{.Release.Name}}-postgresql.{{.Release.Namespace}}.svc.cluster.local/{{ .Values.database.dbname }}
41+
value: {{ .Values.database.protocol }}://{{ .Values.database.username }}:$(POSTGRESS_PASSWORD)@{{.Values.database.host | default (printf "%s-postgresql.%s.svc.cluster.local" .Release.Name .Release.Namespace)}}/{{ .Values.database.dbname }}
4042
- name: OIDC_USER_INFO_ENDPOINT
4143
value: {{ .Values.auth.userInfoEndpoint}}
4244
- name: OIDC_ID_KEY

Charts/web-conexs/templates/client_deployment.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ spec:
1313
labels:
1414
app: {{ include "web-conexs.fullname" . }}-client
1515
spec:
16+
securityContext:
17+
runAsUser: 1000
1618
containers:
1719
- name: {{ include "web-conexs.fullname" . }}-client
1820
image: "{{ .Values.client.deployment.image.repository }}:{{ .Values.client.deployment.image.tag | default .Chart.AppVersion }}"

Charts/web-conexs/templates/submitter_deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ spec:
4545
name: {{.Values.database.passwordSecretName}}
4646
key: passwords
4747
- name: POSTGRESURL
48-
value: {{ .Values.database.protocol }}://{{ .Values.database.username }}:$(POSTGRESS_PASSWORD)@{{.Release.Name}}-postgresql.{{.Release.Namespace}}.svc.cluster.local/{{ .Values.database.dbname }}
48+
value: {{ .Values.database.protocol }}://{{ .Values.database.username }}:$(POSTGRESS_PASSWORD)@{{.Values.database.host | default (printf "%s-postgresql.%s.svc.cluster.local" .Release.Name .Release.Namespace)}}/{{ .Values.database.dbname }}
4949
- name: ORCA_IMAGE
5050
value: {{ .Values.submitter.singularity.orca }}
5151
- name: FDMNES_IMAGE

Charts/web-conexs/values.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ database:
7676
dbname: webconexsdb
7777
protocol: "postgresql+psycopg2"
7878
passwordSecretName: application-passwords
79+
host: ""
7980

8081
auth:
8182
userInfoEndpoint: ""

0 commit comments

Comments
 (0)