Skip to content

Commit 16c6e77

Browse files
committed
Working w/o secrets
1 parent 0b9521c commit 16c6e77

File tree

2 files changed

+43
-12
lines changed

2 files changed

+43
-12
lines changed

src/helm-chart/templates/deployment.yaml

Lines changed: 38 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,43 @@ spec:
2828
securityContext:
2929
{{- toYaml .Values.podSecurityContext | nindent 8 }}
3030
containers:
31-
- name: {{ .Chart.Name }}
32-
securityContext:
33-
{{- toYaml .Values.securityContext | nindent 12 }}
34-
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
35-
imagePullPolicy: {{ .Values.image.pullPolicy }}
31+
{{- with .Values.db }}
32+
- name: {{ $.Chart.Name }}-db
33+
image: "{{ .image.repository }}:{{ .image.tag | default $.Chart.AppVersion }}"
34+
imagePullPolicy: {{ .image.pullPolicy }}
35+
env:
36+
- name: POSTGRES_DB
37+
value: paws
38+
ports:
39+
- name: postgresql
40+
containerPort: 5432
41+
protocol: TCP
42+
# volumeMounts:
43+
# - name: {{ $.Release.Name }}-db
44+
# mountPath: /var/lib/postgresql/data
45+
# subPath: postgresql-data
46+
{{- end }}
47+
{{- with .Values.server }}
48+
- name: {{ $.Chart.Name }}-server
49+
image: "{{ .image.repository }}:{{ .image.tag | default $.Chart.AppVersion }}"
50+
imagePullPolicy: {{ .image.pullPolicy }}
51+
ports:
52+
- containerPort: 5000
53+
protocol: TCP
54+
livenessProbe:
55+
httpGet:
56+
path: /api/user/test
57+
port: 5000
58+
readinessProbe:
59+
httpGet:
60+
path: /api/user/test
61+
port: 5000
62+
{{- end }}
63+
64+
{{- with .Values.client }}
65+
- name: {{ $.Chart.Name }}-client
66+
image: "{{ .image.repository }}:{{ .image.tag | default $.Chart.AppVersion }}"
67+
imagePullPolicy: {{ .image.pullPolicy }}
3668
ports:
3769
- name: http
3870
containerPort: 80
@@ -45,8 +77,7 @@ spec:
4577
httpGet:
4678
path: /
4779
port: http
48-
resources:
49-
{{- toYaml .Values.resources | nindent 12 }}
80+
{{- end }}
5081
{{- with .Values.nodeSelector }}
5182
nodeSelector:
5283
{{- toYaml . | nindent 8 }}

src/helm-chart/values.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@ replicaCount: 1
66

77
server:
88
image:
9-
repository: ghcr.io/codeforphilly/paws-data-pipeline/server:latest
9+
repository: ghcr.io/codeforphilly/paws-data-pipeline/server
1010
pullPolicy: Always
1111
# Overrides the image tag whose default is the chart appVersion.
12-
tag: "latest"
12+
tag: "1.2"
1313

1414
client:
1515
image:
16-
repository: ghcr.io/codeforphilly/paws-data-pipeline/client:latest
16+
repository: ghcr.io/codeforphilly/paws-data-pipeline/client
1717
pullPolicy: Always
1818
# Overrides the image tag whose default is the chart appVersion.
19-
tag: "latest"
19+
tag: "1.2"
2020

2121
db:
2222
image:
23-
repository: postgres:11-alpine
23+
repository: postgres
2424
pullPolicy: IfNotPresent
2525
# Overrides the image tag whose default is the chart appVersion.
2626
tag: "11.3-alpine"

0 commit comments

Comments
 (0)