Skip to content

fix: simpliffy passing trust store password #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wgalanciak merged 1 commit into from
Feb 5, 2025
Merged

fix: simpliffy passing trust store password #78

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions charts/intel/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,10 @@ spec:
- name: CT_HQ_BASE_URL
value: {{ .Values.codetogether.url | quote }}

- name: CT_TRUSTSTORE_OPTIONS
value: >-
{{- if .Values.java.customCacerts.enabled }}
-Djavax.net.ssl.trustStore=/etc/ssl/certs/java/cacerts
{{- end }}
{{- if and .Values.java.customCacerts.enabled .Values.java.customCacerts.trustStorePasswordKey }}
-Djavax.net.ssl.trustStorePassword=$(TRUST_STORE_PASSWORD)
{{- end }}
{{- if .Values.java.customCacerts.enabled }}
- name: CT_TRUST_STORE
value: -Djavax.net.ssl.trustStore=/etc/ssl/certs/java/cacerts
{{- end }}

# Custom Java options (excluding trust store related settings)
{{- if .Values.java.customJavaOptions }}
Expand All @@ -60,7 +56,7 @@ spec:

# Set trust store password only if trustStorePasswordKey is provided
{{- if and .Values.java.customCacerts.enabled .Values.java.customCacerts.trustStorePasswordKey }}
- name: TRUST_STORE_PASSWORD
- name: CT_TRUST_STORE_PASSWD
valueFrom:
secretKeyRef:
name: {{ .Values.java.customCacerts.cacertsSecretName }}
Expand Down
Loading