Skip to content

Commit 699ce10

Browse files
fix predefined secretname for ingress not to include suffix tls (#62)
* fix predefined secretname for ingress not to include suffix tls * update chart version * add ability to add ingress labels
1 parent 516ce67 commit 699ce10

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

standard-app/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: standard-app
33
description: A Helm chart library by Cloudkite
44
type: application
5-
version: 0.9.7
5+
version: 0.9.8
66
maintainters:
77
88
name: cloudkite

standard-app/example.values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ apps:
147147
args:
148148
- /etc/scripts/script1.sh
149149
secrets:
150-
dataFrom: true
150+
- secretKey: example
151151
containers:
152152
example-container-1:
153153
image: us-central1-docker.pkg.dev/cloudkite-infra-ops/cloudkite-docker-images/app-1

standard-app/templates/network/ingress.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ metadata:
99
{{- with $.Values.labels }}
1010
{{- toYaml . | nindent 4 }}
1111
{{- end }}
12+
{{- with $.Values.ingress.labels }}
13+
{{- toYaml . | nindent 4 }}
14+
{{- end }}
1215
annotations:
1316
{{- range $key, $value := .Values.ingress.annotations }}
1417
{{ $key }}: {{ $value | quote }}
@@ -52,7 +55,7 @@ spec:
5255
{{- range .Values.ingress.hosts }}
5356
- hosts:
5457
- {{ . | quote }}
55-
secretName: {{ $.Values.ingress.secretName | default . | replace "." "-" | replace "*" "star" }}-tls
58+
secretName: {{ default ( . | replace "." "-" | replace "*" "star" | printf "%s-tls") $.Values.ingress.secretName }}
5659
{{- end }}
5760
{{- end }}
5861
---

0 commit comments

Comments
 (0)