diff --git a/charts/gitlab/charts/unicorn/templates/ingress.yaml b/charts/gitlab/charts/unicorn/templates/ingress.yaml index 2af1340027e004da7eff88edf507625db0a83bba..598a8bcce9d6dd3d89d22e132df64763a16db534 100644 --- a/charts/gitlab/charts/unicorn/templates/ingress.yaml +++ b/charts/gitlab/charts/unicorn/templates/ingress.yaml @@ -28,11 +28,13 @@ spec: backend: serviceName: {{ template "fullname" . }} servicePort: {{ .Values.service.workhorseExternalPort }} + {{- if .Values.global.hosts.https -}} {{- if $tlsSecret }} tls: - hosts: - {{ $gitlabHostname }} secretName: {{ $tlsSecret }} {{- end }} + {{- end -}} {{- end -}} {{- end -}} diff --git a/charts/minio/templates/ingress.yaml b/charts/minio/templates/ingress.yaml index 695e3a086c910d73f3079c9396a03db7f67908f3..6761ea4c8afca57ca8ec0318435a778e0d0f0996 100644 --- a/charts/minio/templates/ingress.yaml +++ b/charts/minio/templates/ingress.yaml @@ -29,11 +29,13 @@ spec: backend: serviceName: {{ template "minio.fullname" . }}-svc servicePort: {{ .Values.servicePort }} + {{- if .Values.global.hosts.https -}} {{- if $tlsSecret }} tls: - hosts: - {{ $minioHostname }} secretName: {{ $tlsSecret }} {{- end }} + {{- end -}} {{- end -}} {{- end -}} diff --git a/charts/registry/templates/ingress.yaml b/charts/registry/templates/ingress.yaml index 937981e4cda4b7ef4cdc77fc65e9887d6865de3e..a9803fcafb56659c218f5fce4d2efe4b9c4e8846 100644 --- a/charts/registry/templates/ingress.yaml +++ b/charts/registry/templates/ingress.yaml @@ -29,11 +29,13 @@ spec: backend: serviceName: {{ template "fullname" . }} servicePort: {{ .Values.service.externalPort }} + {{- if .Values.global.hosts.https -}} {{- if $tlsSecret }} tls: - hosts: - {{ $hostname }} secretName: {{ $tlsSecret }} {{- end -}} + {{- end -}} {{- end -}} {{- end -}} diff --git a/templates/NOTES.txt b/templates/NOTES.txt index 3929d1d4ecb861ae380513dd43eaff0cd7c025af..03b50edd0de4da0ef037b0f14e8da33744bff281 100644 --- a/templates/NOTES.txt +++ b/templates/NOTES.txt @@ -33,4 +33,4 @@ WARNING: Automatic TLS certificate generation with cert-manager is disabled and {{- end -}} {{- end -}} {{/* run deprecations */}} -{{ include "gitlab.deprecations" . }} +{{ include "gitlab.deprecations" . }} \ No newline at end of file