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

TT-11532 added config option for the http server in mdcb 2.5.1 #284

Merged
merged 12 commits into from
May 28, 2024
16 changes: 14 additions & 2 deletions components/tyk-mdcb/templates/deployment-mdcb.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ spec:
httpGet:
path: {{ .Values.mdcb.probes.liveness.path }}
port: {{ .Values.mdcb.probes.healthCheckPort}}
scheme: "HTTP"
scheme: {{ if .Values.mdcb.httpServerOptions.useSSL }}HTTPS{{ else }}HTTP{{ end }}
initialDelaySeconds: {{ .Values.mdcb.probes.liveness.initialDelaySeconds }}
periodSeconds: {{ .Values.mdcb.probes.liveness.periodSeconds }}
timeoutSeconds: {{ .Values.mdcb.probes.liveness.timeoutSeconds }}
Expand All @@ -57,7 +57,7 @@ spec:
httpGet:
path: {{ .Values.mdcb.probes.readiness.path }}
port: {{ .Values.mdcb.probes.healthCheckPort}}
scheme: "HTTP"
scheme: {{ if .Values.mdcb.httpServerOptions.useSSL }}HTTPS{{ else }}HTTP{{ end }}
resources:
{{- toYaml .Values.mdcb.resources | nindent 12 }}
volumeMounts:
Expand Down Expand Up @@ -124,6 +124,18 @@ spec:
- name: TYK_MDCB_SERVEROPTIONS_CERTIFICATE_CERTFILE
value: "{{ .Values.mdcb.tls.certificateCertFile }}"
{{- end }}

{{- if .Values.mdcb.httpServerOptions.useSSL }}
- name: TYK_MDCB_HTTPSERVEROPTIONS_USESSL
value: "{{ .Values.mdcb.httpServerOptions.useSSL }}"
- name: TYK_MDCB_HTTPSERVEROPTIONS_CERTIFICATE_KEYFILE
value: "{{ .Values.mdcb.httpServerOptions.certificateKeyFile }}"
- name: TYK_MDCB_HTTPSERVEROPTIONS_CERTIFICATE_CERTFILE
value: "{{ .Values.mdcb.httpServerOptions.certificateCertFile }}"
- name: TYK_MDCB_HTTPSERVEROPTIONS_MINVERSION
value: "{{ .Values.mdcb.httpServerOptions.minVersion }}"
{{- end }}

{{ if .Values.global.mtls.privateCertificateEncodingSecret }}
- name: TYK_MDCB_SECURITY_PRIVATECERTIFICATEENCODINGSECRET
value: {{ .Values.global.mtls.privateCertificateEncodingSecret | quote }}
Expand Down
12 changes: 11 additions & 1 deletion components/tyk-mdcb/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,17 @@ mdcb:

# If enabled, aggregate data will be generated per minute.
storeAnalyticsPerMinute: false


# defines the SSL/TLS settings for the http server where the healthcheck is exposed
httpServerOptions:
# if enabled then the endpoints will be served over https
useSSL: false
# certificateKeyFile: /path-to-cert-keyfile
# certificateCertFile: /path-to-certfile

# For TLS 1.0 use 769, for TLS 1.1 use 770, for TLS 1.2 use 771, for TLS 1.3 use 772
# minVersion: 771
komalsukhani marked this conversation as resolved.
Show resolved Hide resolved

probes:
# This port lets MDCB allow standard health checks.
# It also defines the path for liveness and readiness probes.
Expand Down
7 changes: 7 additions & 0 deletions tyk-control-plane/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1189,6 +1189,13 @@ tyk-mdcb:

# If enabled, aggregate data will be generated per minute.
storeAnalyticsPerMinute: false
httpServerOptions:
# if enabled then the endpoints will be served over https
useSSL: false
# certificateKeyFile: /path-to-cert-keyfile
# certificateCertFile: /path-to-certfile
# For TLS 1.0 use 769, for TLS 1.1 use 770, for TLS 1.2 use 771, for TLS 1.3 use 772
# minVersion: 771

probes:
# This port lets MDCB allow standard health checks.
Expand Down