Merge branch '19-add-support-for-new-nmaas-sp' into 'master'

Resolve "Add support for new nmaas-sp"

Closes #19

See merge request !7

README.md

 # nmaas
 
-![Version: 1.2.12](https://img.shields.io/badge/Version-1.2.12-informational?style=flat-square) ![AppVersion: 1.6.3](https://img.shields.io/badge/AppVersion-1.6.3-informational?style=flat-square)
+![Version: 1.2.13-1](https://img.shields.io/badge/Version-1.2.13--1-informational?style=flat-square) ![AppVersion: 1.6.3](https://img.shields.io/badge/AppVersion-1.6.3-informational?style=flat-square)
 
 GÉANT Network Management as a Service Helm chart for Kubernetes
 
@@ -182,11 +182,14 @@ GÉANT Network Management as a Service Helm chart for Kubernetes
 | sp.enabled | bool | `false` |  |
 | sp.image.pullPolicy | string | `"Always"` |  |
 | sp.image.repository | string | `"artifactory.software.geant.org/nmaas-docker-local/nmaas-sp"` |  |
-| sp.image.tag | string | `"1.2.0"` |  |
+| sp.image.tag | string | `"1.6.3"` |  |
 | sp.ingress.className | string | `""` | defaults to .Values.platform.properties.k8s.ingress.controller.ingressClass if not set |
 | sp.name | string | `"nmaas-sp"` |  |
 | sp.port | int | `443` |  |
+| sp.properties.idp.entityId | string | `"https://keycloak.example.com/realms/master"` |  |
+| sp.properties.idp.metadataUrl | string | `"https://keycloak.example.com/realms/master/protocol/saml/descriptor"` |  |
 | sp.properties.idp.name | string | `"edugain"` |  |
+| sp.properties.idp.remoteUser | string | `"email"` |  |
 | sp.properties.idp.uri | string | `"https://login.terena.org/wayf/saml2/idp/metadata.php"` |  |
 | sp.properties.idp.userId | string | `"uid"` |  |
 | sp.targetPort | int | `80` |  |

charts/nmaas/Chart.yaml

 apiVersion: v2
 name: nmaas
 description: GÉANT Network Management as a Service Helm chart for Kubernetes
-version: 1.2.12
+version: 1.2.13-1
 appVersion: 1.6.3
 keywords:
   - Network Management

charts/nmaas/templates/nmaas-sp-deployment.yaml

@@ -48,7 +48,13 @@ spec:
           - name: SP_HOST
             value: {{ .Values.sp.host | default .Values.global.nmaasDomain | quote }}
           - name: SP_USED_ID
-            value: {{ .Values.sp.properties.idp.userId }}
+            value: {{ .Values.sp.properties.idp.userId | quote }}
+          - name: SP_REMOTE_USER
+            value: {{ .Values.sp.properties.idp.remoteUser | quote }}
+          - name: SP_SSO_ENTITY_ID
+            value: {{ .Values.sp.properties.idp.entityId | quote }}
+          - name: SP_METADATA_URL
+            value: {{ .Values.sp.properties.idp.metadataUrl | quote }}
       imagePullSecrets:
       - name: {{ .Values.global.registrysecret }}
 {{- end -}}

charts/nmaas/values.yaml

@@ -245,7 +245,7 @@ sp:
   name: nmaas-sp
   image:
     repository: artifactory.software.geant.org/nmaas-docker-local/nmaas-sp
-    tag: "1.2.0"
+    tag: "1.6.3"
     pullPolicy: Always
   ingress:
     # -- defaults to .Values.platform.properties.k8s.ingress.controller.ingressClass if not set
@@ -259,6 +259,9 @@ sp:
       name: edugain
       uri: https://login.terena.org/wayf/saml2/idp/metadata.php
       userId: uid
+      remoteUser: email
+      entityId: https://keycloak.example.com/realms/master
+      metadataUrl: https://keycloak.example.com/realms/master/protocol/saml/descriptor
 
 helm:
   enabled: true