diff options
Diffstat (limited to 'kubernetes/common')
28 files changed, 53 insertions, 36 deletions
diff --git a/kubernetes/common/cassandra/Chart.yaml b/kubernetes/common/cassandra/Chart.yaml index 29688cde2c..4eee3a0bde 100644 --- a/kubernetes/common/cassandra/Chart.yaml +++ b/kubernetes/common/cassandra/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: ONAP cassandra name: cassandra -version: 5.0.0 +version: 6.0.0 diff --git a/kubernetes/common/cassandra/requirements.yaml b/kubernetes/common/cassandra/requirements.yaml index 8c1b1975c0..bab2c4befc 100644 --- a/kubernetes/common/cassandra/requirements.yaml +++ b/kubernetes/common/cassandra/requirements.yaml @@ -15,5 +15,5 @@ dependencies: - name: common - version: ~5.x-0 + version: ~6.x-0 repository: '@local' 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/dgbuilder/Chart.yaml b/kubernetes/common/dgbuilder/Chart.yaml index 2063cb390e..95677ac82b 100644 --- a/kubernetes/common/dgbuilder/Chart.yaml +++ b/kubernetes/common/dgbuilder/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: D.G. Builder application name: dgbuilder -version: 5.0.0
\ No newline at end of file +version: 6.0.0
\ No newline at end of file diff --git a/kubernetes/common/dgbuilder/requirements.yaml b/kubernetes/common/dgbuilder/requirements.yaml index 3ec7ed7fdd..7d56bf28ef 100644 --- a/kubernetes/common/dgbuilder/requirements.yaml +++ b/kubernetes/common/dgbuilder/requirements.yaml @@ -14,5 +14,5 @@ dependencies: - name: common - version: ~5.x-0 + version: ~6.x-0 repository: '@local'
\ No newline at end of file diff --git a/kubernetes/common/dgbuilder/values.yaml b/kubernetes/common/dgbuilder/values.yaml index 96d7dffb0a..105facf2b9 100644 --- a/kubernetes/common/dgbuilder/values.yaml +++ b/kubernetes/common/dgbuilder/values.yaml @@ -84,7 +84,7 @@ secrets: ################################################################# # application image repository: nexus3.onap.org:10001 -image: onap/ccsdk-dgbuilder-image:0.6.3 +image: onap/ccsdk-dgbuilder-image:0.7.2 pullPolicy: Always # flag to enable debugging - application support required diff --git a/kubernetes/common/etcd/Chart.yaml b/kubernetes/common/etcd/Chart.yaml index 012a4e13ce..edf91b8f47 100644 --- a/kubernetes/common/etcd/Chart.yaml +++ b/kubernetes/common/etcd/Chart.yaml @@ -15,7 +15,7 @@ apiVersion: v1 name: etcd home: https://github.com/coreos/etcd -version: 5.0.0 +version: 6.0.0 appVersion: 2.2.5 description: Distributed reliable key-value store for the most critical data of a distributed system. diff --git a/kubernetes/common/etcd/requirements.yaml b/kubernetes/common/etcd/requirements.yaml index 29a38351ef..facbc4434e 100644 --- a/kubernetes/common/etcd/requirements.yaml +++ b/kubernetes/common/etcd/requirements.yaml @@ -14,5 +14,5 @@ # limitations under the License dependencies: - name: common - version: ~5.x-0 + version: ~6.x-0 repository: '@local' diff --git a/kubernetes/common/mariadb-galera/Chart.yaml b/kubernetes/common/mariadb-galera/Chart.yaml index 1688e0e9c2..3b3de09091 100644 --- a/kubernetes/common/mariadb-galera/Chart.yaml +++ b/kubernetes/common/mariadb-galera/Chart.yaml @@ -15,7 +15,7 @@ apiVersion: v1 description: Chart for MariaDB Galera cluster name: mariadb-galera -version: 5.0.0 +version: 6.0.0 keywords: - mariadb - mysql diff --git a/kubernetes/common/mariadb-galera/requirements.yaml b/kubernetes/common/mariadb-galera/requirements.yaml index d323ddaa2b..4fbecbfab2 100644 --- a/kubernetes/common/mariadb-galera/requirements.yaml +++ b/kubernetes/common/mariadb-galera/requirements.yaml @@ -14,5 +14,5 @@ dependencies: - name: common - version: ~5.x-0 + version: ~6.x-0 repository: 'file://../common'
\ No newline at end of file diff --git a/kubernetes/common/mariadb-init/Chart.yaml b/kubernetes/common/mariadb-init/Chart.yaml index 47b8b8f11c..62a6f63a54 100644 --- a/kubernetes/common/mariadb-init/Chart.yaml +++ b/kubernetes/common/mariadb-init/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: Chart for MariaDB Galera init job name: mariadb-init -version: 5.0.0 +version: 6.0.0 diff --git a/kubernetes/common/mariadb-init/requirements.yaml b/kubernetes/common/mariadb-init/requirements.yaml index d323ddaa2b..4fbecbfab2 100644 --- a/kubernetes/common/mariadb-init/requirements.yaml +++ b/kubernetes/common/mariadb-init/requirements.yaml @@ -14,5 +14,5 @@ dependencies: - name: common - version: ~5.x-0 + version: ~6.x-0 repository: 'file://../common'
\ No newline at end of file diff --git a/kubernetes/common/mongo/Chart.yaml b/kubernetes/common/mongo/Chart.yaml index f08a53bdc8..e708efb12f 100644 --- a/kubernetes/common/mongo/Chart.yaml +++ b/kubernetes/common/mongo/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: MongoDB Server name: mongo -version: 5.0.0 +version: 6.0.0 diff --git a/kubernetes/common/mongo/requirements.yaml b/kubernetes/common/mongo/requirements.yaml index 79d7de4dd3..f99477141f 100644 --- a/kubernetes/common/mongo/requirements.yaml +++ b/kubernetes/common/mongo/requirements.yaml @@ -14,5 +14,5 @@ dependencies: - name: common - version: ~5.x-0 + version: ~6.x-0 repository: '@local' diff --git a/kubernetes/common/music/Chart.yaml b/kubernetes/common/music/Chart.yaml index db8962ca10..381b536430 100644 --- a/kubernetes/common/music/Chart.yaml +++ b/kubernetes/common/music/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: MUSIC - Multi-site State Coordination Service name: music -version: 5.0.0 +version: 6.0.0 diff --git a/kubernetes/common/music/charts/music-cassandra-job/Chart.yaml b/kubernetes/common/music/charts/music-cassandra-job/Chart.yaml index 0a8cf35ba3..301fb46756 100644 --- a/kubernetes/common/music/charts/music-cassandra-job/Chart.yaml +++ b/kubernetes/common/music/charts/music-cassandra-job/Chart.yaml @@ -15,5 +15,5 @@ apiVersion: v1 description: Cassandra Job - Run CQL Scripts after Cassandra Starts. name: music-cassandra-job -version: 5.0.0 +version: 6.0.0 diff --git a/kubernetes/common/music/charts/music-cassandra/Chart.yaml b/kubernetes/common/music/charts/music-cassandra/Chart.yaml index b94527f96b..7392b9879c 100644 --- a/kubernetes/common/music/charts/music-cassandra/Chart.yaml +++ b/kubernetes/common/music/charts/music-cassandra/Chart.yaml @@ -15,5 +15,5 @@ apiVersion: v1 description: ONAP - Cassandra Database name: music-cassandra -version: 5.0.0 +version: 6.0.0 diff --git a/kubernetes/common/music/charts/music-cassandra/requirements.yaml b/kubernetes/common/music/charts/music-cassandra/requirements.yaml index 761922361a..38536fcd78 100644 --- a/kubernetes/common/music/charts/music-cassandra/requirements.yaml +++ b/kubernetes/common/music/charts/music-cassandra/requirements.yaml @@ -14,5 +14,5 @@ dependencies: - name: common - version: ~5.x-0 + version: ~6.x-0 repository: '@local'
\ No newline at end of file diff --git a/kubernetes/common/music/charts/music-tomcat/Chart.yaml b/kubernetes/common/music/charts/music-tomcat/Chart.yaml index 207f9dcc03..ec3934a2c5 100755 --- a/kubernetes/common/music/charts/music-tomcat/Chart.yaml +++ b/kubernetes/common/music/charts/music-tomcat/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP - MUSIC Tomcat Container name: music-tomcat -version: 5.0.0 +version: 6.0.0 diff --git a/kubernetes/common/music/charts/music-tomcat/requirements.yaml b/kubernetes/common/music/charts/music-tomcat/requirements.yaml index a3dabc0508..7aed47bc52 100755 --- a/kubernetes/common/music/charts/music-tomcat/requirements.yaml +++ b/kubernetes/common/music/charts/music-tomcat/requirements.yaml @@ -15,5 +15,5 @@ dependencies: - name: common - version: ~5.x-0 + version: ~6.x-0 repository: '@local'
\ No newline at end of file diff --git a/kubernetes/common/music/requirements.yaml b/kubernetes/common/music/requirements.yaml index ad039c205b..a7089ea6b3 100644 --- a/kubernetes/common/music/requirements.yaml +++ b/kubernetes/common/music/requirements.yaml @@ -14,5 +14,5 @@ dependencies: - name: common - version: ~5.x-0 + version: ~6.x-0 repository: '@local' diff --git a/kubernetes/common/network-name-gen/Chart.yaml b/kubernetes/common/network-name-gen/Chart.yaml index 4ba7de9022..0725fcdb8f 100644 --- a/kubernetes/common/network-name-gen/Chart.yaml +++ b/kubernetes/common/network-name-gen/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1
description: Name Generation Micro Service
name: network-name-gen
-version: 5.0.0
+version: 6.0.0
diff --git a/kubernetes/common/network-name-gen/requirements.yaml b/kubernetes/common/network-name-gen/requirements.yaml index eda693f832..8152196ab5 100644 --- a/kubernetes/common/network-name-gen/requirements.yaml +++ b/kubernetes/common/network-name-gen/requirements.yaml @@ -14,13 +14,13 @@ dependencies:
- name: common
- version: ~5.x-0
+ version: ~6.x-0
repository: '@local'
- name: mariadb-galera
- version: ~5.x-0
+ version: ~6.x-0
repository: '@local'
condition: global.mariadbGalera.localCluster
- name: mariadb-init
- version: ~5.x-0
+ version: ~6.x-0
repository: '@local'
condition: not global.mariadbGalera.localCluster
diff --git a/kubernetes/common/postgres/Chart.yaml b/kubernetes/common/postgres/Chart.yaml index b16a55a012..8cba9c018f 100644 --- a/kubernetes/common/postgres/Chart.yaml +++ b/kubernetes/common/postgres/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP Postgres Server name: postgres -version: 5.0.0 +version: 6.0.0 diff --git a/kubernetes/common/postgres/requirements.yaml b/kubernetes/common/postgres/requirements.yaml index 5b097f3ab7..76afd96b98 100644 --- a/kubernetes/common/postgres/requirements.yaml +++ b/kubernetes/common/postgres/requirements.yaml @@ -14,5 +14,5 @@ dependencies: - name: common - version: ~5.x-0 + version: ~6.x-0 repository: '@local' |