sets tls port for ingress (#114)

Author: michbeck100

charts/api7/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.13.2
+version: 0.13.3
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/api7/README.md

@@ -1,6 +1,6 @@
 # api7ee3
 
-![Version: 0.13.2](https://img.shields.io/badge/Version-0.13.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.0](https://img.shields.io/badge/AppVersion-3.0.0-informational?style=flat-square)
+![Version: 0.13.3](https://img.shields.io/badge/Version-0.13.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.0](https://img.shields.io/badge/AppVersion-3.0.0-informational?style=flat-square)
 
 A Helm chart for Kubernetes
 
@@ -109,4 +109,3 @@ A Helm chart for Kubernetes
 | serviceAccount.create | bool | `true` |  |
 | serviceAccount.name | string | `""` |  |
 | tolerations | list | `[]` |  |
-

charts/api7/templates/dashboard-ingress.yaml

@@ -1,6 +1,9 @@
 {{- if .Values.dashboard_service.ingress.enabled -}}
 {{- $fullName := printf "%s-dashboard" (include "api7ee3.fullname" .) -}}
 {{- $svcPort := .Values.dashboard_service.port -}}
+{{- if .Values.dashboard_configuration.server.listen.disable -}}
+  {{- $svcPort = .Values.dashboard_service.tlsPort -}}
+{{- end }}
 {{- if and .Values.dashboard_service.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
   {{- if not (hasKey .Values.dashboard_service.ingress.annotations "kubernetes.io/ingress.class") }}
   {{- $_ := set .Values.dashboard_service.ingress.annotations "kubernetes.io/ingress.class" .Values.dashboard_service.ingress.className}}
@@ -18,8 +21,11 @@ metadata:
   name: {{ $fullName }}
   labels:
     {{- include "api7ee3.labels" . | nindent 4 }}
-  {{- with .Values.dashboard_service.ingress.annotations }}
   annotations:
+  {{- if .Values.dashboard_configuration.server.listen.disable }}
+    nginx.ingress.kubernetes.io/backend-protocol: HTTPS
+  {{- end }}
+  {{- with .Values.dashboard_service.ingress.annotations }}
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec: