diff --git a/README.md b/README.md index 7f3b8565243fdedbeff5aed57ccff04e0a45838b..3cd19d6843c0458e1647c9c6174a4de6c2e55b09 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # nmaas -  +  GÉANT Network Management as a Service Helm chart for Kubernetes diff --git a/charts/nmaas/Chart.yaml b/charts/nmaas/Chart.yaml index fbed46fe882f3184995769f42b845aada023d3d8..d479c036be31c200d335c308ac45cd8365678100 100644 --- a/charts/nmaas/Chart.yaml +++ b/charts/nmaas/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: nmaas description: GÉANT Network Management as a Service Helm chart for Kubernetes -version: 1.2.14 +version: 1.2.15-1 appVersion: 1.6.4 keywords: - Network Management diff --git a/charts/nmaas/templates/nmaas-platform-deployment.yaml b/charts/nmaas/templates/nmaas-platform-deployment.yaml index 91d4bffbc1ab829278b4233e1295a37eac6d87ad..dbbc702aec70272a849cce86e3aad43c30cc0ac0 100644 --- a/charts/nmaas/templates/nmaas-platform-deployment.yaml +++ b/charts/nmaas/templates/nmaas-platform-deployment.yaml @@ -104,7 +104,11 @@ spec: - name: PLATFORM_PORT value: "{{ .Values.platform.port }}" - name: PORTAL_HOST - value: {{ .Values.global.portalHost | default .Values.global.nmaasDomain | quote }} + {{- if .Values.portal.tls }} + value: {{ (printf "https://%s" (.Values.global.portalHost | default .Values.global.nmaasDomain)) | quote }} + {{- else }} + value: {{ (printf "http://%s" (.Values.global.portalHost | default .Values.global.nmaasDomain)) | quote }} + {{- end }} - name: DEPLOYMENT_CHECK_INTERVAL value: {{ .Values.platform.properties.serviceDeploymentCheckInterval | quote }} - name: DEPLOYMENT_CHECK_TIMEOUT