Skip to content

Commit f391c9a

Browse files
committed
apply suggestions
1 parent d73a40c commit f391c9a

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

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

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -128,15 +128,17 @@ spec:
128128
- name: TLS_OUTBOUND_API_CA_ROOT_CERT_PATH
129129
{{- if .Values.scalarManager.tls.downstream.caRootCertSecret }}
130130
value: "/tls/ca/certs/ca.crt"
131-
{{- else if and .Values.scalarManager.tls.certManager.enabled (not .Values.scalarManager.tls.certManager.selfSigned.enabled) }}
132-
# For CA-based cert-manager issuers, we assume ca.crt is present in the secret.
133-
value: "/tls/scalar-manager/certs/ca.crt"
134-
{{- else if and .Values.scalarManager.tls.certManager.enabled .Values.scalarManager.tls.certManager.selfSigned.enabled (eq .Values.scalarManager.tls.certManager.selfSigned.type "selfSigned") }}
131+
{{- else if .Values.scalarManager.tls.certManager.enabled }}
132+
{{- if and .Values.scalarManager.tls.certManager.selfSigned.enabled (eq .Values.scalarManager.tls.certManager.selfSigned.type "selfSigned") }}
135133
# If using a self-signed cert (not from a CA), the cert itself is the trust anchor.
136134
value: "/tls/scalar-manager/certs/tls.crt"
137-
{{- else }}
138-
# Default fallback, though this case might need further review based on expected configurations.
135+
{{- else }}
136+
# For CA-based cert-manager issuers (self-signed or not), we assume ca.crt is present in the secret.
139137
value: "/tls/scalar-manager/certs/ca.crt"
138+
{{- end }}
139+
{{- else }}
140+
# Manual mode without a caRootCertSecret, assume the server cert is the trust anchor.
141+
value: "/tls/scalar-manager/certs/tls.crt"
140142
{{- end }}
141143
{{- end }}
142144
{{- if .Values.scalarManager.tls.upstream.grafana.enabled }}
@@ -171,7 +173,7 @@ spec:
171173
- name: api-application-properties-volume
172174
configMap:
173175
name: {{ include "scalar-manager.fullname" . }}-api-application-properties
174-
{{- if and .Values.scalarManager.tls.downstream.enabled (not .Values.scalarManager.tls.certManager.enabled) }}
176+
{{- if and .Values.scalarManager.tls.downstream.enabled (not .Values.scalarManager.tls.certManager.enabled) .Values.scalarManager.tls.downstream.certChainSecret .Values.scalarManager.tls.downstream.privateKeySecret }}
175177
- name: scalar-manager-tls-volume
176178
projected:
177179
sources:

0 commit comments

Comments
 (0)