You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: charts/scalar-manager/templates/scalar-manager/deployment.yaml
+9-7Lines changed: 9 additions & 7 deletions
Original file line number
Diff line number
Diff line change
@@ -128,15 +128,17 @@ spec:
128
128
- name: TLS_OUTBOUND_API_CA_ROOT_CERT_PATH
129
129
{{- if .Values.scalarManager.tls.downstream.caRootCertSecret }}
130
130
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") }}
135
133
# If using a self-signed cert (not from a CA), the cert itself is the trust anchor.
136
134
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.
139
137
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"
140
142
{{- end }}
141
143
{{- end }}
142
144
{{- if .Values.scalarManager.tls.upstream.grafana.enabled }}
@@ -171,7 +173,7 @@ spec:
171
173
- name: api-application-properties-volume
172
174
configMap:
173
175
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 }}
0 commit comments