Skip to content
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.

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

Support certificate stores #108

Merged
merged 3 commits into from
Jan 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion charts/orkes-conductor-standalone/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ description: Orkes Conductor Standalone (recommended only for testing and develo

type: application

version: 2.6.46
version: 2.6.47
appVersion: "2.6.46"
2 changes: 1 addition & 1 deletion charts/orkes-conductor/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ description: Orkes Conductor

type: application

version: 2.6.46
version: 2.6.47
appVersion: "2.6.46"
24 changes: 24 additions & 0 deletions charts/orkes-conductor/templates/deployment.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{{- $securityEnabled := eq (toString .Values.security.enabled) "true" -}}
{{- $clusterMode := eq (toString .Values.redis.clusterMode) "true" -}}
{{- $enableCustomTrustStore := eq (toString .Values.enableCustomTrustStore) "true" -}}
{{- if $securityEnabled -}}
{{- $validation := .Values.security.defaultUserEmail | required "security.defaultUserEmail is required." -}}
{{- $validation := .Values.security.defaultUserName | required "security.defaultUserName is required." -}}
Expand Down Expand Up @@ -330,6 +331,14 @@ spec:
value: localhost
- name: conductor.worker.http.block.ips
value: {{ .Values.workers.blockIps | quote }}
{{- if $enableCustomTrustStore }}
- name: conductor.worker.http.customcerts.enabled
value: "true"
- name: conductor.worker.http.customcerts.path
value: {{ printf "/app/certificates/%s" .Values.jksFileName | quote }}
- name: conductor.worker.http.customcerts.password
value: {{ .Values.jksFilePassword | quote }}
{{- end }}
- name: conductor.server.url
value: http://{{ include "orkes-conductor.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local:5000/api/
{{- if $securityEnabled }}
Expand All @@ -344,6 +353,12 @@ spec:
fieldPath: status.podIP
image: "{{ .Values.workerImage.repository }}:{{ .Values.workerImage.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
{{- if $enableCustomTrustStore }}
volumeMounts:
- name: custom-truststore-vol
mountPath: {{ printf "/app/certificates/%s" .Values.jksFileName | quote }}
subPath: {{ .Values.jksFileName | quote }}
{{- end }}
name: {{ include "orkes-conductor-workers.fullname" . }}-workers
resources:
limits:
Expand All @@ -355,6 +370,15 @@ spec:
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
dnsPolicy: ClusterFirst
{{- if $enableCustomTrustStore }}
volumes:
- name: custom-truststore-vol
configMap:
name: "custom-truststore-cm"
items:
- key: {{ .Values.jksFileName | quote }}
path: {{ .Values.jksFileName | quote }}
{{- end }}
imagePullSecrets:
- name: orkesregistry
restartPolicy: Always
Expand Down
5 changes: 5 additions & 0 deletions charts/orkes-conductor/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,11 @@ imageCredentials:
email: [email protected]
password:

enableCustomTrustStore: false
# If you are using a custom trust store, provide the following variables
# jksFileName:
# jksFilePassword:

security:
allowedOrigins: "*"
enabled: false
Expand Down
Loading