diff options
Diffstat (limited to 'kubernetes/common')
30 files changed, 232 insertions, 154 deletions
diff --git a/kubernetes/common/cassandra/Chart.yaml b/kubernetes/common/cassandra/Chart.yaml index 8095acbddd..bb4c5b4beb 100644 --- a/kubernetes/common/cassandra/Chart.yaml +++ b/kubernetes/common/cassandra/Chart.yaml @@ -18,15 +18,15 @@ apiVersion: v2 description: ONAP cassandra name: cassandra -version: 11.0.0 +version: 12.0.0 dependencies: - name: common - version: ~11.x-0 + version: ~12.x-0 repository: 'file://../common' - name: repositoryGenerator - version: ~11.x-0 + version: ~12.x-0 repository: 'file://../repositoryGenerator' - name: serviceAccount - version: ~11.x-0 + version: ~12.x-0 repository: 'file://../serviceAccount' diff --git a/kubernetes/common/cert-wrapper/Chart.yaml b/kubernetes/common/cert-wrapper/Chart.yaml index fbafd9a4f8..c42a319d7c 100644 --- a/kubernetes/common/cert-wrapper/Chart.yaml +++ b/kubernetes/common/cert-wrapper/Chart.yaml @@ -17,9 +17,9 @@ apiVersion: v2 description: Wrapper chart to allow truststore to be shared among cert-initializer instances name: cert-wrapper -version: 11.0.0 +version: 12.0.0 dependencies: - name: certInitializer - version: ~11.x-0 + version: ~12.x-0 repository: 'file://../certInitializer' diff --git a/kubernetes/common/certInitializer/Chart.yaml b/kubernetes/common/certInitializer/Chart.yaml index f083bf8f53..6b4e0dfdce 100644 --- a/kubernetes/common/certInitializer/Chart.yaml +++ b/kubernetes/common/certInitializer/Chart.yaml @@ -17,15 +17,15 @@ apiVersion: v2 description: Template used to obtain certificates in onap name: certInitializer -version: 11.0.0 +version: 12.0.0 dependencies: - name: common - version: ~11.x-0 + version: ~12.x-0 repository: 'file://../common' - name: readinessCheck - version: ~11.x-0 + version: ~12.x-0 repository: 'file://../readinessCheck' - name: repositoryGenerator - version: ~11.x-0 + version: ~12.x-0 repository: 'file://../repositoryGenerator' diff --git a/kubernetes/common/certManagerCertificate/Chart.yaml b/kubernetes/common/certManagerCertificate/Chart.yaml index b65f9f38fd..4854a62de5 100644 --- a/kubernetes/common/certManagerCertificate/Chart.yaml +++ b/kubernetes/common/certManagerCertificate/Chart.yaml @@ -17,12 +17,12 @@ apiVersion: v2 name: certManagerCertificate description: A Helm chart for Cert-Manager Certificate CRD template -version: 11.0.0 +version: 12.0.0 dependencies: - name: common - version: ~11.x-0 + version: ~12.x-0 repository: 'file://../common' - name: cmpv2Config - version: ~11.x-0 + version: ~12.x-0 repository: 'file://../cmpv2Config' diff --git a/kubernetes/common/cmpv2Config/Chart.yaml b/kubernetes/common/cmpv2Config/Chart.yaml index 7689e08d97..c076c99d39 100644 --- a/kubernetes/common/cmpv2Config/Chart.yaml +++ b/kubernetes/common/cmpv2Config/Chart.yaml @@ -17,9 +17,9 @@ apiVersion: v2 description: Template used to store cmpv2 configuration in onap name: cmpv2Config -version: 11.0.0 +version: 12.0.0 dependencies: - name: common - version: ~11.x-0 + version: ~12.x-0 repository: 'file://../common' diff --git a/kubernetes/common/common/Chart.yaml b/kubernetes/common/common/Chart.yaml index aeb07eeb15..f041511b8f 100644 --- a/kubernetes/common/common/Chart.yaml +++ b/kubernetes/common/common/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v2 description: Common templates for inclusion in other charts name: common -version: 11.0.0 +version: 12.0.0 diff --git a/kubernetes/common/common/templates/_ingress.tpl b/kubernetes/common/common/templates/_ingress.tpl index 4fc2e4b1c9..d8a944712a 100644 --- a/kubernetes/common/common/templates/_ingress.tpl +++ b/kubernetes/common/common/templates/_ingress.tpl @@ -14,13 +14,56 @@ # See the License for the specific language governing permissions and # limitations under the License. */}} +{{/* + Create the hostname as concatination <baseaddr>.<baseurl> + - baseaddr: from component values: ingress.service.baseaddr + - baseurl: from values: global.ingress.virtualhost.baseurl + which van be overwritten in the component via: ingress.baseurlOverride +*/}} {{- define "ingress.config.host" -}} {{- $dot := default . .dot -}} {{- $baseaddr := (required "'baseaddr' param, set to the specific part of the fqdn, is required." .baseaddr) -}} {{- $burl := (required "'baseurl' param, set to the generic part of the fqdn, is required." $dot.Values.global.ingress.virtualhost.baseurl) -}} +{{- $burl := include "common.ingress._overrideIfDefined" (dict "currVal" $burl "parent" (default (dict) $dot.Values.ingress) "var" "baseurlOverride") -}} {{ printf "%s.%s" $baseaddr $burl }} {{- end -}} +{{/* + Helper function to add the tls route +*/}} +{{- define "ingress.config.tls" -}} +{{- $dot := default . .dot -}} +{{- $baseaddr := (required "'baseaddr' param, set to the specific part of the fqdn, is required." .baseaddr) -}} +{{- if $dot.Values.global.ingress.config }} +{{- if $dot.Values.global.ingress.config.ssl }} +{{- if eq $dot.Values.global.ingress.config.ssl "redirect" }} + tls: + httpsRedirect: true + - port: + number: 443 + name: https + protocol: HTTPS + tls: +{{- if $dot.Values.global.ingress.config }} +{{- if $dot.Values.global.ingress.config.tls }} + credentialName: {{ default "ingress-tls-secret" $dot.Values.global.ingress.config.tls.secret }} +{{- else }} + credentialName: "ingress-tls-secret" +{{- end }} +{{- else }} + credentialName: "ingress-tls-secret" +{{- end }} + mode: SIMPLE + hosts: + - {{ include "ingress.config.host" (dict "dot" $dot "baseaddr" $baseaddr) }} +{{- end }} +{{- end }} +{{- end }} +{{- end -}} + +{{/* + Helper function to add the route to the service +*/}} {{- define "ingress.config.port" -}} {{- $dot := default . .dot -}} {{ range .Values.ingress.service }} @@ -44,9 +87,11 @@ {{- end }} {{- end -}} +{{/* + Helper function to add the route to the service +*/}} {{- define "istio.config.route" -}} {{- $dot := default . .dot -}} -{{ range .Values.ingress.service }} http: - route: - destination: @@ -66,8 +111,10 @@ {{- end }} host: {{ .name }} {{- end -}} -{{- end -}} +{{/* + Helper function to add ssl annotations +*/}} {{- define "ingress.config.annotations.ssl" -}} {{- if .Values.ingress.config -}} {{- if .Values.ingress.config.ssl -}} @@ -85,6 +132,9 @@ nginx.ingress.kubernetes.io/ssl-redirect: "false" {{- end -}} +{{/* + Helper function to add annotations +*/}} {{- define "ingress.config.annotations" -}} {{- if .Values.ingress -}} {{- if .Values.ingress.annotations -}} @@ -94,6 +144,9 @@ nginx.ingress.kubernetes.io/ssl-redirect: "false" {{ include "ingress.config.annotations.ssl" . | indent 4 | trim }} {{- end -}} +{{/* + Helper function to check the existance of an override value +*/}} {{- define "common.ingress._overrideIfDefined" -}} {{- $currValue := .currVal }} {{- $parent := .parent }} @@ -109,20 +162,38 @@ nginx.ingress.kubernetes.io/ssl-redirect: "false" {{- end -}} {{- end -}} -{{- define "common.ingress" -}} +{{/* + Helper function to check, if Ingress is enabled +*/}} +{{- define "common.ingress._enabled" -}} {{- $dot := default . .dot -}} -{{- if .Values.ingress -}} - {{- $ingressEnabled := default false .Values.ingress.enabled -}} - {{- $ingressEnabled := include "common.ingress._overrideIfDefined" (dict "currVal" $ingressEnabled "parent" (default (dict) .Values.global.ingress) "var" "enabled") }} - {{- $ingressEnabled := include "common.ingress._overrideIfDefined" (dict "currVal" $ingressEnabled "parent" .Values.ingress "var" "enabledOverride") }} -{{- if $ingressEnabled }} -{{- if (include "common.onServiceMesh" .) }} -{{- if eq (default "istio" .Values.global.serviceMesh.engine) "istio" }} - {{- $dot := default . .dot -}} +{{- if $dot.Values.ingress -}} +{{- if $dot.Values.global.ingress -}} +{{- if (default false $dot.Values.global.ingress.enabled) -}} +{{- if (default false $dot.Values.global.ingress.enable_all) -}} +true +{{- else -}} +{{- if $dot.Values.ingress.enabled -}} +true +{{- end -}} +{{- end -}} +{{- end -}} +{{- end -}} +{{- end -}} +{{- end -}} + +{{/* + Create Istio Ingress resources per defined service +*/}} +{{- define "common.istioIngress" -}} +{{- $dot := default . .dot -}} +{{ range $dot.Values.ingress.service }} +{{- $baseaddr := (required "'baseaddr' param, set to the specific part of the fqdn, is required." .baseaddr) }} +--- apiVersion: networking.istio.io/v1beta1 kind: Gateway metadata: - name: {{ include "common.fullname" . }}-gateway + name: {{ $baseaddr }}-gateway spec: selector: istio: ingressgateway # use Istio default gateway implementation @@ -132,80 +203,87 @@ spec: name: http protocol: HTTP hosts: - {{- range .Values.ingress.service }}{{ $baseaddr := required "baseaddr" .baseaddr }} - - {{ include "ingress.config.host" (dict "dot" $dot "baseaddr" $baseaddr) }} - {{- end }} -{{- if .Values.global.ingress.config }} -{{- if .Values.global.ingress.config.ssl }} -{{- if eq .Values.global.ingress.config.ssl "redirect" }} - tls: - httpsRedirect: true - - port: - number: 443 - name: https - protocol: HTTPS - tls: -{{- if .Values.global.ingress.config }} -{{- if .Values.global.ingress.config.tls }} - credentialName: {{ default "ingress-tls-secret" .Values.global.ingress.config.tls.secret }} -{{- else }} - credentialName: "ingress-tls-secret" -{{- end }} -{{- else }} - credentialName: "ingress-tls-secret" -{{- end }} - mode: SIMPLE - hosts: - {{- range .Values.ingress.service }}{{ $baseaddr := required "baseaddr" .baseaddr }} - {{ include "ingress.config.host" (dict "dot" $dot "baseaddr" $baseaddr) }} - {{- end }} -{{- end }} -{{- end }} -{{- end }} + {{ include "ingress.config.tls" (dict "dot" $dot "baseaddr" $baseaddr) }} --- apiVersion: networking.istio.io/v1beta1 kind: VirtualService metadata: - name: {{ include "common.fullname" . }}-service + name: {{ $baseaddr }}-service spec: hosts: - {{- range .Values.ingress.service }}{{ $baseaddr := required "baseaddr" .baseaddr }} - {{ include "ingress.config.host" (dict "dot" $dot "baseaddr" $baseaddr) }} - {{- end }} gateways: - - {{ include "common.fullname" . }}-gateway + - {{ $baseaddr }}-gateway {{ include "istio.config.route" . | trim }} +{{- end -}} {{- end -}} -{{- else -}} + +{{/* + Create default Ingress resource +*/}} +{{- define "common.nginxIngress" -}} +{{- $dot := default . .dot -}} apiVersion: networking.k8s.io/v1 kind: Ingress metadata: - name: {{ include "common.fullname" . }}-ingress + name: {{ include "common.fullname" $dot }}-ingress annotations: - {{ include "ingress.config.annotations" . }} + {{ include "ingress.config.annotations" $dot }} labels: - app: {{ .Chart.Name }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ include "common.release" . }} - heritage: {{ .Release.Service }} + app: {{ $dot.Chart.Name }} + chart: {{ $dot.Chart.Name }}-{{ $dot.Chart.Version | replace "+" "_" }} + release: {{ include "common.release" $dot }} + heritage: {{ $dot.Release.Service }} spec: rules: - {{ include "ingress.config.port" . | trim }} -{{- if .Values.ingress.tls }} + {{ include "ingress.config.port" $dot | trim }} +{{- if $dot.Values.ingress.tls }} tls: -{{ toYaml .Values.ingress.tls | indent 4 }} +{{ toYaml $dot.Values.ingress.tls | indent 4 }} {{- end -}} -{{- if .Values.ingress.config -}} -{{- if .Values.ingress.config.tls -}} +{{- if $dot.Values.ingress.config -}} +{{- if $dot.Values.ingress.config.tls -}} tls: - hosts: - {{- range .Values.ingress.service }}{{ $baseaddr := required "baseaddr" .baseaddr }} + {{- range $dot.Values.ingress.service }}{{ $baseaddr := required "baseaddr" .baseaddr }} - {{ include "ingress.config.host" (dict "dot" $dot "baseaddr" $baseaddr) }} - {{- end }} - secretName: {{ required "secret" (tpl (default "" .Values.ingress.config.tls.secret) $dot) }} -{{- end -}} -{{- end -}} -{{- end -}} + {{- end }} + secretName: {{ required "secret" (tpl (default "" $dot.Values.ingress.config.tls.secret) $dot) }} +{{- end -}} {{- end -}} {{- end -}} + +{{/* + Create ingress template + Will create ingress template depending on the following values: + - .Values.global.ingress.enabled : enables Ingress globally + - .Values.global.ingress.enable_all : override default Ingress for all charts + - .Values.ingress.enabled : sets Ingress per chart basis + + | global.ingress.enabled | global.ingress.enable_all |ingress.enabled | result | + |------------------------|---------------------------|----------------|------------| + | false | any | any | no ingress | + | true | false | false | no ingress | + | true | true | any | ingress | + | true | false | true | ingress | + + If ServiceMesh (Istio) is enabled the respective resources are created: + - Gateway + - VirtualService + + If ServiceMesh is disabled the standard Ingress resource is creates: + - Ingress +*/}} +{{- define "common.ingress" -}} +{{- $dot := default . .dot -}} +{{- if (include "common.ingress._enabled" (dict "dot" $dot)) }} +{{- if (include "common.onServiceMesh" .) }} +{{- if eq (default "istio" .Values.global.serviceMesh.engine) "istio" }} +{{ include "common.istioIngress" (dict "dot" $dot) }} +{{- end -}} +{{- else -}} +{{ include "common.nginxIngress" (dict "dot" $dot) }} +{{- end -}} +{{- end -}} {{- end -}} diff --git a/kubernetes/common/common/templates/_service.tpl b/kubernetes/common/common/templates/_service.tpl index 379992eae8..7b88af02aa 100644 --- a/kubernetes/common/common/templates/_service.tpl +++ b/kubernetes/common/common/templates/_service.tpl @@ -242,7 +242,7 @@ spec: {{- $labels := default (dict) .labels -}} {{- $matchLabels := default (dict) .matchLabels -}} {{- if and (include "common.onServiceMesh" $dot) (eq $serviceType "NodePort") }} -{{- $serviceType = "ClusterIP" }} +{{- $serviceType = "ClusterIP" }} {{- end }} {{- if (and (include "common.needTLS" $dot) $both_tls_and_plain) }} diff --git a/kubernetes/common/dgbuilder/Chart.yaml b/kubernetes/common/dgbuilder/Chart.yaml index 1a1b8e2d86..5884211147 100644 --- a/kubernetes/common/dgbuilder/Chart.yaml +++ b/kubernetes/common/dgbuilder/Chart.yaml @@ -17,18 +17,18 @@ apiVersion: v2 description: D.G. Builder application name: dgbuilder -version: 11.0.0 +version: 12.0.0 dependencies: - name: common - version: ~11.x-0 + version: ~12.x-0 repository: 'file://../common' - name: certInitializer - version: ~11.x-0 + version: ~12.x-0 repository: '@local' - name: repositoryGenerator - version: ~11.x-0 + version: ~12.x-0 repository: 'file://../repositoryGenerator' - name: serviceAccount - version: ~11.x-0 + version: ~12.x-0 repository: 'file://../serviceAccount' diff --git a/kubernetes/common/elasticsearch/Chart.yaml b/kubernetes/common/elasticsearch/Chart.yaml index cd187ffdbd..cc0271165d 100644 --- a/kubernetes/common/elasticsearch/Chart.yaml +++ b/kubernetes/common/elasticsearch/Chart.yaml @@ -18,26 +18,26 @@ apiVersion: v2 description: ONAP elasticsearch name: elasticsearch -version: 11.0.0 +version: 12.0.0 dependencies: - name: common - version: ~11.x-0 + version: ~12.x-0 repository: 'file://../common' - name: master - version: ~11.x-0 + version: ~12.x-0 repository: 'file://components/master' - name: data - version: ~11.x-0 + version: ~12.x-0 repository: 'file://components/data' condition: elasticsearch.data.enabled,data.enabled - name: curator - version: ~11.x-0 + version: ~12.x-0 repository: 'file://components/curator' condition: elasticsearch.curator.enabled,curator.enabled - name: certInitializer - version: ~11.x-0 + version: ~12.x-0 repository: 'file://../certInitializer' - name: repositoryGenerator - version: ~11.x-0 + version: ~12.x-0 repository: 'file://../repositoryGenerator' diff --git a/kubernetes/common/elasticsearch/components/curator/Chart.yaml b/kubernetes/common/elasticsearch/components/curator/Chart.yaml index 21017c4999..96f75a1c5d 100644 --- a/kubernetes/common/elasticsearch/components/curator/Chart.yaml +++ b/kubernetes/common/elasticsearch/components/curator/Chart.yaml @@ -18,12 +18,12 @@ apiVersion: v2 description: ONAP elasticsearch curator name: curator -version: 11.0.0 +version: 12.0.0 dependencies: - name: common - version: ~11.x-0 + version: ~12.x-0 repository: 'file://../../../common' - name: repositoryGenerator - version: ~11.x-0 + version: ~12.x-0 repository: 'file://../../../repositoryGenerator'
\ No newline at end of file diff --git a/kubernetes/common/elasticsearch/components/data/Chart.yaml b/kubernetes/common/elasticsearch/components/data/Chart.yaml index fc890719cb..1b42a19078 100644 --- a/kubernetes/common/elasticsearch/components/data/Chart.yaml +++ b/kubernetes/common/elasticsearch/components/data/Chart.yaml @@ -18,12 +18,12 @@ apiVersion: v2 description: ONAP elasticsearch data name: data -version: 11.0.0 +version: 12.0.0 dependencies: - name: common - version: ~11.x-0 + version: ~12.x-0 repository: 'file://../../../common' - name: repositoryGenerator - version: ~11.x-0 + version: ~12.x-0 repository: 'file://../../../repositoryGenerator' diff --git a/kubernetes/common/elasticsearch/components/master/Chart.yaml b/kubernetes/common/elasticsearch/components/master/Chart.yaml index 43fe42f62b..5ff277d12b 100644 --- a/kubernetes/common/elasticsearch/components/master/Chart.yaml +++ b/kubernetes/common/elasticsearch/components/master/Chart.yaml @@ -17,12 +17,12 @@ apiVersion: v2 description: ONAP elasticsearch master name: master -version: 11.0.0 +version: 12.0.0 dependencies: - name: common - version: ~11.x-0 + version: ~12.x-0 repository: 'file://../../../common' - name: repositoryGenerator - version: ~11.x-0 + version: ~12.x-0 repository: 'file://../../../repositoryGenerator' diff --git a/kubernetes/common/etcd-init/Chart.yaml b/kubernetes/common/etcd-init/Chart.yaml index b4c36c368e..a76d534d59 100644 --- a/kubernetes/common/etcd-init/Chart.yaml +++ b/kubernetes/common/etcd-init/Chart.yaml @@ -17,12 +17,12 @@ apiVersion: v2 description: Chart for etcd init job name: etcd-init -version: 11.0.0 +version: 12.0.0 dependencies: - name: common - version: ~11.x-0 + version: ~12.x-0 repository: 'file://../common' - name: repositoryGenerator - version: ~11.x-0 + version: ~12.x-0 repository: 'file://../repositoryGenerator'
\ No newline at end of file diff --git a/kubernetes/common/etcd/Chart.yaml b/kubernetes/common/etcd/Chart.yaml index 44649199fa..e038e26a48 100644 --- a/kubernetes/common/etcd/Chart.yaml +++ b/kubernetes/common/etcd/Chart.yaml @@ -17,7 +17,7 @@ apiVersion: v2 name: etcd home: https://github.com/coreos/etcd -version: 11.0.0 +version: 12.0.0 appVersion: 2.2.5 description: Distributed reliable key-value store for the most critical data of a distributed system. @@ -27,8 +27,8 @@ sources: dependencies: - name: common - version: ~11.x-0 + version: ~12.x-0 repository: 'file://../common' - name: repositoryGenerator - version: ~11.x-0 + version: ~12.x-0 repository: 'file://../repositoryGenerator' diff --git a/kubernetes/common/logConfiguration/Chart.yaml b/kubernetes/common/logConfiguration/Chart.yaml index 5b9286ddb8..8207803af3 100644 --- a/kubernetes/common/logConfiguration/Chart.yaml +++ b/kubernetes/common/logConfiguration/Chart.yaml @@ -17,9 +17,9 @@ apiVersion: v2 description: Template used to create same STDOUT log configuration name: logConfiguration -version: 11.0.0 +version: 12.0.0 dependencies: - name: common - version: ~11.x-0 + version: ~12.x-0 repository: 'file://../common' diff --git a/kubernetes/common/mariadb-galera/Chart.yaml b/kubernetes/common/mariadb-galera/Chart.yaml index ddbaacca40..587fa38302 100644 --- a/kubernetes/common/mariadb-galera/Chart.yaml +++ b/kubernetes/common/mariadb-galera/Chart.yaml @@ -18,7 +18,7 @@ apiVersion: v2 description: Chart for MariaDB Galera cluster name: mariadb-galera -version: 11.0.0 +version: 12.0.0 keywords: - mariadb - mysql @@ -29,14 +29,14 @@ keywords: dependencies: - name: common - version: ~11.x-0 + version: ~12.x-0 repository: 'file://../common' - name: readinessCheck - version: ~11.x-0 + version: ~12.x-0 repository: 'file://../readinessCheck' - name: repositoryGenerator - version: ~11.x-0 + version: ~12.x-0 repository: 'file://../repositoryGenerator' - name: serviceAccount - version: ~11.x-0 + version: ~12.x-0 repository: 'file://../serviceAccount'
\ No newline at end of file diff --git a/kubernetes/common/mariadb-init/Chart.yaml b/kubernetes/common/mariadb-init/Chart.yaml index b9fa78f814..32e6762b63 100644 --- a/kubernetes/common/mariadb-init/Chart.yaml +++ b/kubernetes/common/mariadb-init/Chart.yaml @@ -17,12 +17,12 @@ apiVersion: v2 description: Chart for MariaDB Galera init job name: mariadb-init -version: 11.0.0 +version: 12.0.0 dependencies: - name: common - version: ~11.x-0 + version: ~12.x-0 repository: 'file://../common' - name: repositoryGenerator - version: ~11.x-0 + version: ~12.x-0 repository: 'file://../repositoryGenerator'
\ No newline at end of file diff --git a/kubernetes/common/mongo/Chart.yaml b/kubernetes/common/mongo/Chart.yaml index 229da3530f..180af14e98 100644 --- a/kubernetes/common/mongo/Chart.yaml +++ b/kubernetes/common/mongo/Chart.yaml @@ -16,12 +16,12 @@ apiVersion: v2 description: MongoDB Server name: mongo -version: 11.0.0 +version: 12.0.0 dependencies: - name: common - version: ~11.x-0 + version: ~12.x-0 repository: 'file://../common' - name: repositoryGenerator - version: ~11.x-0 + version: ~12.x-0 repository: 'file://../repositoryGenerator'
\ No newline at end of file diff --git a/kubernetes/common/music/Chart.yaml b/kubernetes/common/music/Chart.yaml index f275168967..c41eff4d10 100644 --- a/kubernetes/common/music/Chart.yaml +++ b/kubernetes/common/music/Chart.yaml @@ -17,18 +17,18 @@ apiVersion: v2 description: MUSIC - Multi-site State Coordination Service name: music -version: 11.0.0 +version: 12.0.0 dependencies: - name: music-cassandra - version: ~11.x-0 + version: ~12.x-0 repository: 'file://components/music-cassandra' - name: common - version: ~11.x-0 + version: ~12.x-0 repository: 'file://../common' - name: repositoryGenerator - version: ~11.x-0 + version: ~12.x-0 repository: 'file://../repositoryGenerator' - name: certInitializer - version: ~11.x-0 + version: ~12.x-0 repository: 'file://../certInitializer'
\ No newline at end of file diff --git a/kubernetes/common/music/components/music-cassandra/Chart.yaml b/kubernetes/common/music/components/music-cassandra/Chart.yaml index 8a575c72f7..6c68082595 100644 --- a/kubernetes/common/music/components/music-cassandra/Chart.yaml +++ b/kubernetes/common/music/components/music-cassandra/Chart.yaml @@ -17,12 +17,12 @@ apiVersion: v2 description: ONAP - Cassandra Database name: music-cassandra -version: 11.0.0 +version: 12.0.0 dependencies: - name: common - version: ~11.x-0 + version: ~12.x-0 repository: 'file://../../../common' - name: repositoryGenerator - version: ~11.x-0 + version: ~12.x-0 repository: 'file://../../../repositoryGenerator'
\ No newline at end of file diff --git a/kubernetes/common/network-name-gen/Chart.yaml b/kubernetes/common/network-name-gen/Chart.yaml index 2c4ed9e581..17eaa684d8 100644 --- a/kubernetes/common/network-name-gen/Chart.yaml +++ b/kubernetes/common/network-name-gen/Chart.yaml @@ -17,20 +17,20 @@ apiVersion: v2
description: Name Generation Micro Service
name: network-name-gen
-version: 11.0.0
+version: 12.0.0
dependencies:
- name: common
- version: ~11.x-0
+ version: ~12.x-0
repository: 'file://../common'
- name: repositoryGenerator
- version: ~11.x-0
+ version: ~12.x-0
repository: 'file://../repositoryGenerator'
- name: mariadb-galera
- version: ~11.x-0
+ version: ~12.x-0
repository: 'file://../mariadb-galera'
condition: global.mariadbGalera.localCluster
- name: mariadb-init
- version: ~11.x-0
+ version: ~12.x-0
repository: 'file://../mariadb-init'
condition: not global.mariadbGalera.localCluster
\ No newline at end of file diff --git a/kubernetes/common/postgres-init/Chart.yaml b/kubernetes/common/postgres-init/Chart.yaml index ff8c98cd13..9fe2eaedc8 100644 --- a/kubernetes/common/postgres-init/Chart.yaml +++ b/kubernetes/common/postgres-init/Chart.yaml @@ -16,13 +16,13 @@ apiVersion: v2 description: Chart for Postgres init job name: postgres-init -version: 11.0.0 +version: 12.0.0 dependencies: - name: common - version: ~11.x-0 + version: ~12.x-0 repository: 'file://../common' - name: repositoryGenerator - version: ~11.x-0 + version: ~12.x-0 repository: 'file://../repositoryGenerator'
\ No newline at end of file diff --git a/kubernetes/common/postgres/Chart.yaml b/kubernetes/common/postgres/Chart.yaml index 8644bcfd6d..d09f412311 100644 --- a/kubernetes/common/postgres/Chart.yaml +++ b/kubernetes/common/postgres/Chart.yaml @@ -17,12 +17,12 @@ apiVersion: v2 description: ONAP Postgres Server name: postgres -version: 11.0.0 +version: 12.0.0 dependencies: - name: common - version: ~11.x-0 + version: ~12.x-0 repository: 'file://../common' - name: repositoryGenerator - version: ~11.x-0 + version: ~12.x-0 repository: 'file://../repositoryGenerator'
\ No newline at end of file diff --git a/kubernetes/common/readinessCheck/Chart.yaml b/kubernetes/common/readinessCheck/Chart.yaml index 3997aeb260..6caea5f899 100644 --- a/kubernetes/common/readinessCheck/Chart.yaml +++ b/kubernetes/common/readinessCheck/Chart.yaml @@ -17,12 +17,12 @@ apiVersion: v2 description: Template used to wait for other deployment/sts/jobs in onap name: readinessCheck -version: 11.0.0 +version: 12.0.0 dependencies: - name: common - version: ~11.x-0 + version: ~12.x-0 repository: 'file://../common' - name: repositoryGenerator - version: ~11.x-0 + version: ~12.x-0 repository: 'file://../repositoryGenerator'
\ No newline at end of file diff --git a/kubernetes/common/repository-wrapper/Chart.yaml b/kubernetes/common/repository-wrapper/Chart.yaml index c385a3bb36..3823e64cc5 100644 --- a/kubernetes/common/repository-wrapper/Chart.yaml +++ b/kubernetes/common/repository-wrapper/Chart.yaml @@ -17,12 +17,12 @@ apiVersion: v2 description: Wrapper chart to allow docker secret to be shared all instances name: repository-wrapper -version: 11.0.0 +version: 12.0.0 dependencies: - name: common - version: ~11.x-0 + version: ~12.x-0 repository: 'file://../common' - name: repositoryGenerator - version: ~11.x-0 + version: ~12.x-0 repository: 'file://../repositoryGenerator'
\ No newline at end of file diff --git a/kubernetes/common/repositoryGenerator/Chart.yaml b/kubernetes/common/repositoryGenerator/Chart.yaml index fe710e1a2f..52a2793963 100644 --- a/kubernetes/common/repositoryGenerator/Chart.yaml +++ b/kubernetes/common/repositoryGenerator/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v2 description: Template used to generate the right repository link name: repositoryGenerator -version: 11.0.0 +version: 12.0.0 diff --git a/kubernetes/common/roles-wrapper/Chart.yaml b/kubernetes/common/roles-wrapper/Chart.yaml index 8024abafd8..717d12a2a4 100644 --- a/kubernetes/common/roles-wrapper/Chart.yaml +++ b/kubernetes/common/roles-wrapper/Chart.yaml @@ -16,9 +16,9 @@ apiVersion: v2 description: Wrapper chart to allow default roles to be shared among onap instances name: roles-wrapper -version: 11.0.0 +version: 12.0.0 dependencies: - name: common - version: ~11.x-0 + version: ~12.x-0 repository: 'file://../common'
\ No newline at end of file diff --git a/kubernetes/common/serviceAccount/Chart.yaml b/kubernetes/common/serviceAccount/Chart.yaml index 3309753f37..2de9036315 100644 --- a/kubernetes/common/serviceAccount/Chart.yaml +++ b/kubernetes/common/serviceAccount/Chart.yaml @@ -17,9 +17,9 @@ apiVersion: v2 description: Template used to create the right Service Accounts / Role / RoleBinding name: serviceAccount -version: 11.0.0 +version: 12.0.0 dependencies: - name: common - version: ~11.x-0 + version: ~12.x-0 repository: 'file://../common'
\ No newline at end of file diff --git a/kubernetes/common/timescaledb/Chart.yaml b/kubernetes/common/timescaledb/Chart.yaml index 5e84be191b..cb9965f6b6 100644 --- a/kubernetes/common/timescaledb/Chart.yaml +++ b/kubernetes/common/timescaledb/Chart.yaml @@ -22,15 +22,15 @@ apiVersion: v2 appVersion: "1.0" description: ONAP timescaledb name: timescaledb -version: 11.0.0 +version: 12.0.0 dependencies: - name: common - version: ~11.x-0 + version: ~12.x-0 repository: '@local' - name: serviceAccount - version: ~11.x-0 + version: ~12.x-0 repository: '@local' - name: repositoryGenerator - version: ~11.x-0 + version: ~12.x-0 repository: 'file://../repositoryGenerator'
\ No newline at end of file |