Commit d6105116 authored by Alexandre Vincent's avatar Alexandre Vincent
Browse files

Merge branch 'avincent/helm_template_overridable_ssl_redirect' into 'master'

devops/azure: make ssl-redirect overridable to be closer to infra setup

See merge request !176
parents 57be8384 8eab3fb2
Pipeline #58299 passed with stages
in 7 minutes and 50 seconds
......@@ -19,10 +19,9 @@ kind: Ingress
metadata:
annotations:
{{ include "os-wellbore-ddms.commonAnnotations" . | indent 4}}
appgw.ingress.kubernetes.io/ssl-redirect: "true"
appgw.ingress.kubernetes.io/connection-draining: "true"
appgw.ingress.kubernetes.io/connection-draining-timeout: "30"
kubernetes.io/ingress.class: azure/application-gateway
{{- if .Values.ingress.extraAnnotations }}
{{ toYaml .Values.ingress.extraAnnotations | indent 4 }}
{{- end }}
{{ if .Values.ingress.hosts.host }}
cert-manager.io/acme-challenge-type: http01
cert-manager.io/cluster-issuer: letsencrypt
......@@ -49,4 +48,4 @@ spec:
hosts:
- {{ .Values.ingress.hosts.host }}
{{ end }}
{{- end -}}
\ No newline at end of file
{{- end -}}
......@@ -65,10 +65,16 @@ configMap:
ingress:
enabled: false
extraAnnotations:
appgw.ingress.kubernetes.io/ssl-redirect: "true"
appgw.ingress.kubernetes.io/request-timeout: "300"
appgw.ingress.kubernetes.io/connection-draining: "true"
appgw.ingress.kubernetes.io/connection-draining-timeout: "30"
kubernetes.io/ingress.class: azure/application-gateway
hosts:
host: # leave it empty for our dev cluster
pathPrefix: /api/os-wellbore-ddms
tlsSecret: osdu-certificate
authorizationPolicy:
name: wellbore-jwt-authz
\ No newline at end of file
name: wellbore-jwt-authz
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment