9 files changed, 39 insertions, 40 deletions
diff --git a/kubernetes/sdc/components/sdc-be/Chart.yaml b/kubernetes/sdc/components/sdc-be/Chart.yaml
index 6c2254882d..4620c679bd 100644
--- a/kubernetes/sdc/components/sdc-be/Chart.yaml
+++ b/kubernetes/sdc/components/sdc-be/Chart.yaml
@@ -18,15 +18,15 @@
 apiVersion: v2
 description: ONAP Service Design and Creation Backend API
 name: sdc-be
-version: 10.0.0
+version: 11.0.0
 
 dependencies:
   - name: certInitializer
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
diff --git a/kubernetes/sdc/components/sdc-cs/Chart.yaml b/kubernetes/sdc/components/sdc-cs/Chart.yaml
index 0789ee32b2..1ef26a69f0 100644
--- a/kubernetes/sdc/components/sdc-cs/Chart.yaml
+++ b/kubernetes/sdc/components/sdc-cs/Chart.yaml
@@ -18,20 +18,20 @@
 apiVersion: v2
 description: ONAP Service Design and Creation Cassandra
 name: sdc-cs
-version: 10.0.0
+version: 11.0.0
 
 dependencies:
   - name: common
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
   - name: cassandra
-    version: ~10.x-0
+    version: ~11.x-0
     # local reference to common chart, as it is
     # a part of this chart's package and will not
     # be published independently to a repo (at this point)
diff --git a/kubernetes/sdc/components/sdc-fe/Chart.yaml b/kubernetes/sdc/components/sdc-fe/Chart.yaml
index 3db6fc794d..2250947e85 100644
--- a/kubernetes/sdc/components/sdc-fe/Chart.yaml
+++ b/kubernetes/sdc/components/sdc-fe/Chart.yaml
@@ -18,15 +18,15 @@
 apiVersion: v2
 description: ONAP Service Design and Creation Front End
 name: sdc-fe
-version: 10.0.0
+version: 11.0.0
 
 dependencies:
   - name: certInitializer
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
diff --git a/kubernetes/sdc/components/sdc-fe/templates/service.yaml b/kubernetes/sdc/components/sdc-fe/templates/service.yaml
index 968a09c77e..30c3d1122f 100644
--- a/kubernetes/sdc/components/sdc-fe/templates/service.yaml
+++ b/kubernetes/sdc/components/sdc-fe/templates/service.yaml
@@ -39,17 +39,15 @@ metadata:
 spec:
   type: {{ .Values.service.type }}
   ports:
-    - port: {{ .Values.service.internalPort }}
-      name: {{ .Values.service.portName }}
-      targetPort: {{ .Values.service.internalPort }}
-    {{ if (include "common.needTLS" .) }}
-    - port:  {{ .Values.service.internalPort2 }}
-      targetPort: {{ .Values.service.internalPort2 }}
-      name: {{ .Values.service.portName }}s
-      {{ if eq .Values.service.type "NodePort" -}}
-      nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort2 }}
-      {{ end }}
-    {{ end }}
+    {{if eq .Values.service.type "NodePort" -}}
+    - port: {{ (eq "true" (include "common.needTLS" .)) | ternary .Values.service.internalPort2 .Values.service.internalPort }}
+      nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
+      name: {{ .Values.service.portName  }}{{ (eq "true" (include "common.needTLS" .)) | ternary "s" "" }}
+    {{- else -}}
+    - port: {{ (eq "true" (include "common.needTLS" .)) | ternary .Values.service.externalPort2 .Values.service.externalPort }}
+      targetPort: {{ (eq "true" (include "common.needTLS" .)) | ternary .Values.service.internalPort2 .Values.service.internalPort }}
+      name: {{ .Values.service.portName }}{{ (eq "true" (include "common.needTLS" .)) | ternary "s" "" }}
+    {{- end}}
   selector:
     app: {{ include "common.name" . }}
     release: {{ include "common.release" . }}
diff --git a/kubernetes/sdc/components/sdc-fe/values.yaml b/kubernetes/sdc/components/sdc-fe/values.yaml
index 6267da90f3..e86ae4c0d2 100644
--- a/kubernetes/sdc/components/sdc-fe/values.yaml
+++ b/kubernetes/sdc/components/sdc-fe/values.yaml
@@ -114,9 +114,10 @@ service:
   portName: http
   internalPort: 8181
   externalPort: 8181
-  nodePort2: "07"
   internalPort2: 9443
   externalPort2: 9443
+  nodePort: "07"
+
 
 ingress:
   enabled: false
diff --git a/kubernetes/sdc/components/sdc-helm-validator/Chart.yaml b/kubernetes/sdc/components/sdc-helm-validator/Chart.yaml
index 5609083704..771bfbf7db 100644
--- a/kubernetes/sdc/components/sdc-helm-validator/Chart.yaml
+++ b/kubernetes/sdc/components/sdc-helm-validator/Chart.yaml
@@ -19,12 +19,12 @@
 apiVersion: v2
 description: ONAP Service Design and Creation Helm Validator
 name: sdc-helm-validator
-version: 10.0.0
+version: 11.0.0
 
 dependencies:
   - name: repositoryGenerator
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
   - name: common
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
diff --git a/kubernetes/sdc/components/sdc-onboarding-be/Chart.yaml b/kubernetes/sdc/components/sdc-onboarding-be/Chart.yaml
index 5ed3131099..e2ff602dd6 100644
--- a/kubernetes/sdc/components/sdc-onboarding-be/Chart.yaml
+++ b/kubernetes/sdc/components/sdc-onboarding-be/Chart.yaml
@@ -18,15 +18,15 @@
 apiVersion: v2
 description: ONAP Service Design and Creation Onboarding API
 name: sdc-onboarding-be
-version: 10.0.0
+version: 11.0.0
 
 dependencies:
   - name: certInitializer
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
diff --git a/kubernetes/sdc/components/sdc-wfd-be/Chart.yaml b/kubernetes/sdc/components/sdc-wfd-be/Chart.yaml
index 132c5d21ce..6992f6b9ab 100644
--- a/kubernetes/sdc/components/sdc-wfd-be/Chart.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-be/Chart.yaml
@@ -17,15 +17,15 @@
 apiVersion: v2
 description: ONAP Service Design and Creation Workflow Designer backend
 name: sdc-wfd-be
-version: 10.0.0
+version: 11.0.0
 
 dependencies:
   - name: certInitializer
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
diff --git a/kubernetes/sdc/components/sdc-wfd-fe/Chart.yaml b/kubernetes/sdc/components/sdc-wfd-fe/Chart.yaml
index 1b7aa773c9..45f13a04b1 100644
--- a/kubernetes/sdc/components/sdc-wfd-fe/Chart.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-fe/Chart.yaml
@@ -17,15 +17,15 @@
 apiVersion: v2
 description: ONAP Service Design and Creation Workflow Designer frontend
 name: sdc-wfd-fe
-version: 10.0.0
+version: 11.0.0
 
 dependencies:
   - name: certInitializer
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~10.x-0
+    version: ~11.x-0
     repository: '@local'