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.

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

feat(ssl): Allow SSL Proxied EnvVars to be enabled outside of Ingress Configuration #36

Merged
merged 2 commits into from
Sep 30, 2022
Merged

feat(ssl): Allow SSL Proxied EnvVars to be enabled outside of Ingress Configuration #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b5012d
Allow SSL Proxied Environment Variables to be enabled outside of Ingr…
hgranillo Sep 30, 2022
8b12335
Allow Grafana sslProxied to be configured independently
hgranillo Sep 30, 2022
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
6 changes: 3 additions & 3 deletions cryostat/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ spec:
- name: CRYOSTAT_PROBE_TEMPLATE_PATH
value: /opt/cryostat.d/probes.d
- name: CRYOSTAT_EXT_WEB_PORT
value: "{{ if (or (and .Values.core.route.enabled .Values.core.route.tls.enabled) (and .Values.core.ingress.enabled .Values.core.ingress.tls)) }}443{{ else }}80{{ end }}"
value: "{{ if (or (and .Values.core.route.enabled .Values.core.route.tls.enabled) (and .Values.core.ingress.enabled .Values.core.ingress.tls) (.Values.core.sslProxied)) }}443{{ else }}80{{ end }}"
- name: CRYOSTAT_WEB_HOST
value: "{{ if .Values.core.ingress.enabled }}{{ with index .Values.core.ingress.hosts 0 }}{{ .host }}{{ end }}{{ end }}"
- name: CRYOSTAT_PLATFORM
Expand All @@ -54,7 +54,7 @@ spec:
- name: GRAFANA_DATASOURCE_URL
value: http://127.0.0.1:8080
- name: GRAFANA_DASHBOARD_URL
value: "{{ if .Values.grafana.ingress.enabled }}http{{ if .Values.grafana.ingress.tls }}s{{ end }}://{{ with index .Values.grafana.ingress.hosts 0 }}{{ .host }}{{ end }}{{ end }}"
value: "{{ if .Values.grafana.ingress.enabled }}http{{ if (or (.Values.grafana.ingress.tls) (.Values.grafana.sslProxied)) }}s{{ end }}://{{ with index .Values.grafana.ingress.hosts 0 }}{{ .host }}{{ end }}{{ end }}"
- name: CRYOSTAT_DISABLE_SSL
value: "true"
- name: CRYOSTAT_DISABLE_JMX_AUTH
Expand All @@ -63,7 +63,7 @@ spec:
value: "true"
- name: CRYOSTAT_ENABLE_JDP_BROADCAST
value: "false"
{{- if (or (and .Values.core.route.enabled .Values.core.route.tls.enabled) (and .Values.core.ingress.enabled .Values.core.ingress.tls)) }}
{{- if (or (and .Values.core.route.enabled .Values.core.route.tls.enabled) (and .Values.core.ingress.enabled .Values.core.ingress.tls) (.Values.core.sslProxied)) }}
- name: CRYOSTAT_SSL_PROXIED
value: "true"
{{- end }}
Expand Down
4 changes: 4 additions & 0 deletions cryostat/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ core:
httpPort: 8181
## @param core.service.jmxPort Port number to expose on the Service for remote JMX connections to Cryostat
jmxPort: 9091
## @param core.sslProxied Enables SSL Proxied Environment Variables, useful when you are offloading SSL/TLS at External Loadbalancer instead of Ingress
sslProxied: false
ingress:
## @param core.ingress.enabled Whether to create an Ingress object for the Cryostat service
enabled: false
Expand Down Expand Up @@ -68,6 +70,8 @@ grafana:
type: ClusterIP
## @param grafana.service.port Port number to expose on the Service for Grafana's HTTP server
port: 3000
## @param grafana.sslProxied Enables SSL Proxied Environment Variables, useful when you are offloading SSL/TLS at External Loadbalancer instead of Ingress
sslProxied: false
ingress:
## @param grafana.ingress.enabled Whether to create an Ingress object for the Grafana service
enabled: false
Expand Down