Skip to content

Commit 2819fe4

Browse files
committed
apply suggestions
1 parent f391c9a commit 2819fe4

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

charts/scalar-manager/templates/scalar-manager/certmanager.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,9 @@ spec:
8888
{{- end }}
8989
kind: Issuer
9090
{{- else }}
91-
{{- toYaml .Values.scalarManager.tls.certManager.issuerRef | nindent 4 }}
91+
{{- if not (len .Values.scalarManager.tls.certManager.issuerRef) }}
92+
{{- fail "When using cert-manager with an external issuer, scalarManager.tls.certManager.issuerRef must be configured." -}}
93+
{{- end }}
94+
{{- toYaml .Values.scalarManager.tls.certManager.issuerRef | nindent 4 }}
9295
{{- end }}
9396
{{- end }}

charts/scalar-manager/templates/scalar-manager/deployment.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,11 @@ spec:
188188
- key: tls.key
189189
path: tls.key
190190
{{- end }}
191+
{{- if and .Values.scalarManager.tls.downstream.enabled (not .Values.scalarManager.tls.certManager.enabled) }}
192+
{{- if or (not .Values.scalarManager.tls.downstream.certChainSecret) (not .Values.scalarManager.tls.downstream.privateKeySecret) }}
193+
{{- fail "When using manual downstream TLS, both scalarManager.tls.downstream.certChainSecret and scalarManager.tls.downstream.privateKeySecret must be set." -}}
194+
{{- end }}
195+
{{- end -}}
191196
{{- if and .Values.scalarManager.tls.downstream.enabled .Values.scalarManager.tls.certManager.enabled }}
192197
- name: scalar-manager-tls-volume
193198
secret:

0 commit comments

Comments
 (0)