5 files changed, 226 insertions, 55 deletions
diff --git a/kubernetes/common/common/Chart.yaml b/kubernetes/common/common/Chart.yaml
index f4cca48edb..2d68fe93bb 100644
--- a/kubernetes/common/common/Chart.yaml
+++ b/kubernetes/common/common/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: Common templates for inclusion in other charts
 name: common
-version: 5.0.0
+version: 6.0.0
diff --git a/kubernetes/common/common/documentation.rst b/kubernetes/common/common/documentation.rst
index e6cf948d79..d982ab09c6 100644
--- a/kubernetes/common/common/documentation.rst
+++ b/kubernetes/common/common/documentation.rst
@@ -437,7 +437,7 @@ would generate:
     namespace: default
     labels:
       app.kubernetes.io/name: nbi
-      helm.sh/chart: nbi-5.0.0
+      helm.sh/chart: nbi-6.0.0
       app.kubernetes.io/instance: release
       app.kubernetes.io/managed-by: Tiller
   spec:
diff --git a/kubernetes/common/common/templates/_secret.tpl b/kubernetes/common/common/templates/_secret.tpl
index 78e94eab91..064b0c16af 100644
--- a/kubernetes/common/common/templates/_secret.tpl
+++ b/kubernetes/common/common/templates/_secret.tpl
@@ -196,7 +196,18 @@ type: Opaque
         {{- $_ := set $entry "annotations" $secret.annotations }}
       {{- end }}
       {{- if $secret.filePaths }}
-        {{- $_ := set $entry "filePaths" $secret.filePaths }}
+        {{- if kindIs "string" $secret.filePaths }}
+          {{- $evaluated := tpl (default "" $secret.filePaths) $global }}
+          {{- if and $evaluated (ne $evaluated "\"\"") }}
+            {{- $fstr := printf "val:\n%s" ($evaluated | indent 2) }}
+            {{- $flist := (index (tpl $fstr $global | fromYaml) "val") }}
+            {{- $_ := set $entry "filePaths" $flist }}
+          {{- else }}
+            {{- $_ := set $entry "filePaths" (list) }}
+          {{- end }}
+        {{- else }}
+          {{- $_ := set $entry "filePaths" $secret.filePaths }}
+        {{- end }}
       {{- end }}
       {{- $realName := default (include "common.secret.genNameFast" (dict "global" $global "uid" $uid "name" $entry.name) ) $entry.externalSecret }}
       {{- $_ := set $entry "realName" $realName }}
@@ -465,6 +476,7 @@ stringData:
       {{- if eq $type "generic" }}
 data:
         {{- range $curFilePath := $secret.filePaths }}
+          {{- fail (printf "%s" $curFilePath) }}
           {{ tpl ($global.Files.Glob $curFilePath).AsSecrets $global | indent 2 }}
         {{- end }}
         {{- if $secret.filePath }}
diff --git a/kubernetes/common/common/templates/_service.tpl b/kubernetes/common/common/templates/_service.tpl
index 8b430ef2bd..0c7660eb1f 100644
--- a/kubernetes/common/common/templates/_service.tpl
+++ b/kubernetes/common/common/templates/_service.tpl
@@ -54,15 +54,20 @@ annotations:
 {{-   end }}
 {{-   if $msb_informations }}
   msb.onap.org/service-info: '[
+{{-     range $index, $msb_information := $msb_informations }}
+{{-       if ne $index 0 }}
+      ,
+{{-       end }}
       {
-          "serviceName": "{{ include "common.servicename" $dot }}",
-          "version": "{{ default "v1" $msb_informations.version }}",
-          "url": "{{ default "/" $msb_informations.url }}",
-          "protocol": "{{ default "REST" $msb_informations.protocol }}",
-          "port": "{{ $msb_informations.port }}",
-          "visualRange":"{{ default "1" $msb_informations.visualRange }}"
+        "serviceName": "{{ default (include "common.servicename" $dot) $msb_information.serviceName  }}",
+        "version": "{{ default "v1" $msb_information.version }}",
+        "url": "{{ default "/" $msb_information.url }}",
+        "protocol": "{{ default "REST" $msb_information.protocol }}",
+        "port": "{{ $msb_information.port }}",
+        "visualRange":"{{ default "1" $msb_information.visualRange }}"
       }
-      ]'
+{{-    end }}
+    ]'
 {{-   end}}
 {{- end }}
 name: {{ include "common.servicename" $dot }}{{ if $suffix }}{{ print "-" $suffix }}{{ end }}
diff --git a/kubernetes/common/common/templates/_storage.tpl b/kubernetes/common/common/templates/_storage.tpl
index 45c8b7504a..2114d677e6 100644
--- a/kubernetes/common/common/templates/_storage.tpl
+++ b/kubernetes/common/common/templates/_storage.tpl
@@ -16,9 +16,20 @@
 
 {{/*
   Give the root folder for ONAP when using host pathes
+
+  The function takes up to two arguments (inside a dictionary):
+    - .dot : environment (.)
+    - .subPath: the sub path to use, default to
+                ".Values.persistence.mountSubPath"
+
+  Example calls:
+    {{ include "common.storageClass" . }}
+    {{ include "common.storageClass" (dict "dot" . "subPath" "my-awesome-subPath") }}
 */}}
 {{- define "common.persistencePath" -}}
-{{ .Values.global.persistence.mountPath | default .Values.persistence.mountPath }}/{{ include "common.release" . }}/{{ .Values.persistence.mountSubPath }}
+{{-   $dot := default . .dot -}}
+{{-   $subPath := default $dot.Values.persistence.mountSubPath .subPath -}}
+{{ $dot.Values.global.persistence.mountPath | default $dot.Values.persistence.mountPath }}/{{ include "common.release" $dot }}/{{ $subPath }}
 {{- end -}}
 
 {{/*
@@ -26,28 +37,61 @@
   The value "common.fullname"-data is used by default,
   unless either override mechanism is used.
 
-  - .Values.global.persistence.storageClass  : override default storageClass for all charts
-  - .Values.persistence.storageClassOverride : override global and default storage class on a per chart basis
-  - .Values.persistence.storageClass         : override default storage class on a per chart basis
+  - .Values.global.persistence.storageClass  : override default storageClass for
+                                               all charts
+  - .Values.persistence.storageClassOverride : override global and default
+                                               storage class on a per chart
+                                               basis
+  - .Values.persistence.storageClass         : override default storage class on
+                                               per chart basis
+
+  The function takes up to two arguments (inside a dictionary):
+     - .dot : environment (.)
+     - .suffix: suffix to name. if not set, default to "data" when no override
+        mechanism is used.
+     - .persistenceInfos: the persitence values to use, default to
+                          `.Values.persistence`.
+                          Need to be the dict key from `.Values` in string
+                          format.
+                          let's say you have:
+
+                              persistence:
+                                logs:
+                                  enabled: true
+                                  size: 100Mi
+                                  accessMode: ReadWriteOnce
+                                  ...
+
+                          then you have to put `.Values.persitence.logs` in
+                          order to use it.
+
+
+  Example calls:
+    {{ include "common.storageClass" . }}
+    {{ include "common.storageClass" (dict "dot" . "suffix" "my-awesome-suffix") }}
+    {{ include "common.storageClass" (dict "dot" . "suffix" "my-awesome-suffix" "persistenceInfos" .Values.persistenceLog) }}
 */}}
 {{- define "common.storageClass" -}}
-  {{- if .Values.persistence.storageClassOverride -}}
-    {{- if ne "-" .Values.persistence.storageClassOverride -}}
-      {{- printf "%s" .Values.persistence.storageClassOverride -}}
+{{-   $dot := default . .dot -}}
+{{-   $suffix := default "data" .suffix -}}
+{{- $persistenceInfos := default $dot.Values.persistence .persistenceInfos -}}
+  {{- if $persistenceInfos.storageClassOverride -}}
+    {{- if ne "-" $persistenceInfos.storageClassOverride -}}
+      {{- $persistenceInfos.storageClassOverride -}}
     {{- else -}}
       {{- $storage_class := "" -}}
       {{- printf "%q" $storage_class -}}
     {{- end -}}
   {{- else -}}
-    {{- if or .Values.persistence.storageClass .Values.global.persistence.storageClass }}
-      {{- if ne "-" (default .Values.persistence.storageClass .Values.global.persistence.storageClass) -}}
-        {{- printf "%s" (default .Values.persistence.storageClass .Values.global.persistence.storageClass) -}}
+    {{- if or $persistenceInfos.storageClass $dot.Values.global.persistence.storageClass }}
+      {{- if ne "-" (default $persistenceInfos.storageClass $dot.Values.global.persistence.storageClass) -}}
+        {{- default $persistenceInfos.storageClass $dot.Values.global.persistence.storageClass -}}
       {{- else -}}
         {{- $storage_class := "" -}}
         {{- printf "%q" $storage_class -}}
       {{- end -}}
     {{- else -}}
-      {{- printf "%s-data" (include "common.fullname" .) -}}
+      {{- printf "%s-%s" (include "common.fullname" $dot) $suffix -}}
     {{- end -}}
   {{- end -}}
 {{- end -}}
@@ -63,53 +107,104 @@
 
 {{/*
   Generate a PV
+
+  The function takes up to three arguments (inside a dictionary):
+     - .dot : environment (.)
+     - .suffix: suffix to name. if not set, default to "data".
+     - .persistenceInfos: the persitence values to use, default to
+                          `.Values.persistence`.
+                          Need to be the dict key from `.Values` in string
+                          format.
+                          let's say you have:
+
+                              persistence:
+                                logs:
+                                  enabled: true
+                                  size: 100Mi
+                                  accessMode: ReadWriteOnce
+                                  ...
+
+                          then you have to put `.Values.persitence.logs` in
+                          order to use it.
+
+  Example calls:
+    {{ include "common.PV" . }}
+    {{ include "common.PV" (dict "dot" . "suffix" "my-awesome-suffix" "persistenceInfos".Values.persistenceLog ) }}
+    {{ include "common.PV" (dict "dot" . "subPath" "persistenceInfos" .Values.persistence.log) }}
 */}}
 {{- define "common.PV" -}}
-{{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) -}}
-{{- if (include "common.needPV" .) -}}
+{{- $dot := default . .dot -}}
+{{- $suffix := default "data" .suffix -}}
+{{- $metadata_suffix := ternary "" $suffix (eq $suffix "data") -}}
+{{- $persistenceInfos := default $dot.Values.persistence .persistenceInfos -}}
+{{- if and $persistenceInfos.enabled (not $persistenceInfos.existingClaim) -}}
+{{- if (include "common.needPV" $dot) -}}
 kind: PersistentVolume
 apiVersion: v1
-metadata:
-  name: {{ include "common.fullname" . }}-data
-  namespace: {{ include "common.namespace" . }}
-  labels: {{- include "common.labels" . | nindent 4 }}
+metadata: {{- include "common.resourceMetadata" (dict "dot" $dot "suffix" $suffix "labels" $persistenceInfos.labels) | nindent 2 }}
 spec:
   capacity:
-    storage: {{ .Values.persistence.size }}
+    storage: {{ $persistenceInfos.size }}
   accessModes:
-    - {{ .Values.persistence.accessMode }}
-  storageClassName: "{{ include "common.fullname" . }}-data"
-  persistentVolumeReclaimPolicy: {{ .Values.persistence.volumeReclaimPolicy }}
+    - {{ $persistenceInfos.accessMode }}
+  persistentVolumeReclaimPolicy: {{ $persistenceInfos.volumeReclaimPolicy }}
+  storageClassName: "{{ include "common.fullname" $dot }}-{{ $suffix }}"
   hostPath:
-    path: {{ include "common.persistencePath" . }}
+    path: {{ include "common.persistencePath" (dict "dot" $dot "subPath" $persistenceInfos.mountSubPath) }}
 {{- end -}}
 {{- end -}}
 {{- end -}}
 
 {{/*
   Generate N PV for a statefulset
+
+  The function takes up to two arguments (inside a dictionary):
+     - .dot : environment (.)
+     - .suffix: suffix to name. if not set, default to "data".
+     - .persistenceInfos: the persitence values to use, default to
+                          `.Values.persistence`.
+                          Need to be the dict key from `.Values` in string
+                          format.
+                          let's say you have:
+
+                              persistence:
+                                logs:
+                                  enabled: true
+                                  size: 100Mi
+                                  accessMode: ReadWriteOnce
+                                  ...
+
+                          then you have to put `.Values.persitence.logs` in
+                          order to use it.
+
+  Example calls:
+    {{ include "common.replicaPV" . }}
+    {{ include "common.replicaPV" (dict "dot" . "suffix" "my-awesome-suffix" "persistenceInfos" .Values.persistenceLog) }}
+    {{ include "common.replicaPV" (dict dot" . "subPath" "persistenceInfos" .Values.persistence.log) }}
 */}}
 {{- define "common.replicaPV" -}}
-{{- $global := . }}
-{{- if and $global.Values.persistence.enabled (not $global.Values.persistence.existingClaim) }}
-{{- if (include "common.needPV" .) -}}
-{{- range $i := until (int $global.Values.replicaCount)}}
+{{- $dot := default . .dot -}}
+{{- $suffix := default "data" .suffix -}}
+{{- $metadata_suffix := ternary "" $suffix (eq $suffix "data") -}}
+{{- $persistenceInfos := default $dot.Values.persistence .persistenceInfos -}}
+{{- if and $persistenceInfos.enabled (not $persistenceInfos.existingClaim) -}}
+{{- if (include "common.needPV" $dot) -}}
+{{/* TODO: see if we can use "common.PV" after branching F release */}}
+{{- range $i := until (int $dot.Values.replicaCount) }}
+{{- $range_suffix := printf "%s-%d" $metadata_suffix $i }}
 ---
 kind: PersistentVolume
 apiVersion: v1
-metadata:
-  name: {{ include "common.fullname" $global }}-data-{{$i}}
-  namespace: {{ include "common.namespace" $global }}
-  labels: {{- include "common.labels" $global | nindent 4 }}
+metadata: {{- include "common.resourceMetadata" (dict "dot" $dot "suffix" $range_suffix "labels" $persistenceInfos.labels) | nindent 2 }}
 spec:
   capacity:
-    storage: {{ $global.Values.persistence.size}}
+    storage: {{ $persistenceInfos.size }}
   accessModes:
-    - {{ $global.Values.persistence.accessMode }}
-  persistentVolumeReclaimPolicy: {{ $global.Values.persistence.volumeReclaimPolicy }}
-  storageClassName: "{{ include "common.fullname" $global }}-data"
+    - {{ $persistenceInfos.accessMode }}
+  persistentVolumeReclaimPolicy: {{ $persistenceInfos.volumeReclaimPolicy }}
+  storageClassName: "{{ include "common.fullname" $dot }}-{{ $suffix }}"
   hostPath:
-    path: {{ include "common.persistencePath" $global }}-{{$i}}
+    path: {{ include "common.persistencePath"  (dict "dot" $dot "subPath" $persistenceInfos.mountSubPath) }}-{{ $i }}
 {{- end -}}
 {{- end -}}
 {{- end -}}
@@ -117,22 +212,81 @@ spec:
 
 {{/*
   Generate a PVC
+
+  The function takes up to two arguments (inside a dictionary):
+     - .dot : environment (.)
+     - .suffix: suffix to name. if not set, default to "data".
+     - .persistenceInfos: the persitence values to use, default to
+                          `.Values.persistence`.
+                          Need to be the dict key from `.Values` in string
+                          format.
+                          let's say you have:
+
+                              persistence:
+                                logs:
+                                  enabled: true
+                                  size: 100Mi
+                                  accessMode: ReadWriteOnce
+                                  ...
+
+                          then you have to put `.Values.persitence.logs` in
+                          order to use it.
+
+  Example calls:
+    {{ include "common.PVC" . }}
+    {{ include "common.PVC" (dict "dot" . "suffix" "my-awesome-suffix" "persistenceInfos" .Values.persistenceLog) }}
+    {{ include "common.PVC" (dict dot" . "subPath" "persistenceInfos" .Values.persistence.log) }}
 */}}
 {{- define "common.PVC" -}}
-{{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) -}}
+{{- $dot := default . .dot -}}
+{{- $persistenceInfos := default $dot.Values.persistence .persistenceInfos -}}
+{{- $suffix := default "data" .suffix -}}
+{{- $metadata_suffix := ternary "" $suffix (eq $suffix "data") -}}
+{{- if and $persistenceInfos.enabled (not $persistenceInfos.existingClaim) -}}
 kind: PersistentVolumeClaim
 apiVersion: v1
-metadata: {{- include "common.resourceMetadata" . | nindent 2 }}
-{{- if .Values.persistence.annotations }}
-  annotations:
-{{ toYaml .Values.persistence.annotations | indent 4 }}
-{{- end }}
+{{ include "common.PVCTemplate" (dict "dot" $dot "suffix" $suffix "persistenceInfos" $persistenceInfos) }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+  Generate a PVC template for a statefulset
+
+  The function takes up to two arguments (inside a dictionary):
+     - .dot : environment (.)
+     - .suffix: suffix to name. if not set, default to "data".
+     - .persistenceInfos: the persitence values to use, default to
+                          `.Values.persistence`.
+                          Need to be the dict key from `.Values` in string
+                          format.
+                          let's say you have:
+
+                              persistence:
+                                logs:
+                                  enabled: true
+                                  size: 100Mi
+                                  accessMode: ReadWriteOnce
+                                  ...
+
+                          then you have to put `.Values.persitence.logs` in
+                          order to use it.
+
+  Example calls:
+    {{ include "common.PVCTemplate" . }}
+    {{ include "common.PVCTemplate" (dict "dot" . "suffix" "my-awesome-suffix" "persistenceInfos" .Values.persistenceLog) }}
+    {{ include "common.PVCTemplate" (dict dot" . "subPath" "persistenceInfos" .Values.persistence.log) }}
+*/}}
+{{- define "common.PVCTemplate" -}}
+{{- $dot := default . .dot -}}
+{{- $persistenceInfos := default $dot.Values.persistence .persistenceInfos -}}
+{{- $suffix := default "data" .suffix -}}
+{{- $metadata_suffix := ternary "" $suffix (eq $suffix "data") -}}
+metadata: {{- include "common.resourceMetadata" (dict "dot" $dot "suffix" $metadata_suffix "annotations" $persistenceInfos.annotations) | nindent 2 }}
 spec:
   accessModes:
-    - {{ .Values.persistence.accessMode }}
-  storageClassName: {{ include "common.storageClass" . }}
+  - {{ $persistenceInfos.accessMode }}
+  storageClassName: {{ include "common.storageClass" (dict "dot" $dot "suffix" $suffix "persistenceInfos" $persistenceInfos ) }}
   resources:
     requests:
-      storage: {{ .Values.persistence.size }}
-{{- end -}}
+      storage: {{ $persistenceInfos.size }}
 {{- end -}}