Skip to content

Commit 317c7c4

Browse files
authored
Ability to specify additional CA using a secret name/key (#215)
1 parent 30c841e commit 317c7c4

File tree

3 files changed

+15
-2
lines changed

3 files changed

+15
-2
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ vet:
5858

5959
.PHONY: build-ttl.sh
6060
build-ttl.sh:
61-
docker buildx build . -t ttl.sh/${USER}/replicated-sdk:24h -f deploy/Dockerfile
61+
docker buildx build . -t ttl.sh/${USER}/replicated-sdk:24h -f deploy/Dockerfile --load
6262
docker push ttl.sh/${USER}/replicated-sdk:24h
6363

6464
make -C chart build-ttl.sh

chart/templates/replicated-deployment.yaml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,14 @@ spec:
5353
configMap:
5454
defaultMode: 420
5555
name: {{ .Values.privateCAConfigmap }}
56+
{{- else if .Values.privateCASecret }}
57+
- name: additional-certs
58+
secret:
59+
defaultMode: 420
60+
secretName: {{ .Values.privateCASecret.name }}
61+
items:
62+
- key: {{ .Values.privateCASecret.key }}
63+
path: ca.crt
5664
{{- end }}
5765
containers:
5866
- name: replicated
@@ -74,12 +82,16 @@ spec:
7482
{{- if .Values.privateCAConfigmap }}
7583
- mountPath: /certs
7684
name: additional-certs
85+
{{- else if .Values.privateCASecret }}
86+
- mountPath: /certs/ca.crt
87+
subPath: ca.crt
88+
name: additional-certs
7789
{{- end }}
7890
env:
7991
{{- with .Values.extraEnv }}
8092
{{- toYaml . | nindent 8 }}
8193
{{- end }}
82-
{{- if .Values.privateCAConfigmap }}
94+
{{- if or .Values.privateCAConfigmap .Values.privateCASecret }}
8395
- name: SSL_CERT_DIR
8496
value: /certs
8597
{{- end }}

chart/values.yaml.tmpl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ service:
6060
port: 3000
6161

6262
privateCAConfigmap: ~
63+
privateCASecret: ~
6364

6465
extraEnv: []
6566

0 commit comments

Comments
 (0)