[MULTICLOUD] 13.2.0 release

- [k8s] 0.10.3 -> 0.11.0
- [common/etcd] update image (3.2.24 -> 3.2.32)

Issue-ID: MULTICLOUD-1533
Change-Id: Ice827bc7fd8e1db847160678d8b2c9cc815d6d8c
Signed-off-by: Fiete Ostkamp <fiete.ostkamp@telekom.de>

diff --git a/kubernetes/common/etcd/templates/statefulset.yaml b/kubernetes/common/etcd/templates/statefulset.yaml
index f2e04c9..30a8ab2 100644 (file)
--- a/kubernetes/common/etcd/templates/statefulset.yaml
+++ b/kubernetes/common/etcd/templates/statefulset.yaml
@@ -40,7 +40,7 @@ spec:
       {{ include "common.podSecurityContext" . | indent 6 | trim }}
       containers:
       - name: {{ include "common.name" .  }}
-        image: {{ include "repositoryGenerator.googleK8sRepository" . }}/{{ .Values.image }}
+        image: {{ include "repositoryGenerator.quayRepository" . }}/{{ .Values.image }}
         imagePullPolicy: "{{ .Values.pullPolicy }}"
         {{ include "common.containerSecurityContext" . | indent 10 | trim }}
         ports:

diff --git a/kubernetes/common/etcd/values.yaml b/kubernetes/common/etcd/values.yaml
index 69d533c..e01f308 100644 (file)
--- a/kubernetes/common/etcd/values.yaml
+++ b/kubernetes/common/etcd/values.yaml
@@ -26,7 +26,7 @@ global:
 #################################################################
 
 #repository: etcd
-image: etcd-amd64:3.2.24
+image: coreos/etcd:v3.2.32
 pullPolicy: Always
 
 # default number of instances in the StatefulSet

diff --git a/kubernetes/multicloud/Chart.yaml b/kubernetes/multicloud/Chart.yaml
index a360949..6a18ab2 100644 (file)
--- a/kubernetes/multicloud/Chart.yaml
+++ b/kubernetes/multicloud/Chart.yaml
@@ -19,7 +19,7 @@
 apiVersion: v2
 description: ONAP multicloud broker
 name: multicloud
-version: 15.0.5
+version: 15.1.0
 
 dependencies:
   - name: common

diff --git a/kubernetes/multicloud/components/multicloud-k8s/Chart.yaml b/kubernetes/multicloud/components/multicloud-k8s/Chart.yaml
index 426f43e..8413c58 100644 (file)
--- a/kubernetes/multicloud/components/multicloud-k8s/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-k8s/Chart.yaml
@@ -18,7 +18,7 @@
 apiVersion: v2
 description: ONAP Multicloud Kubernetes Plugin
 name: multicloud-k8s
-version: 13.1.5
+version: 13.2.0
 
 dependencies:
   - name: common

diff --git a/kubernetes/multicloud/components/multicloud-k8s/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-k8s/templates/deployment.yaml
index 6718015..fae66bf 100644 (file)
--- a/kubernetes/multicloud/components/multicloud-k8s/templates/deployment.yaml
+++ b/kubernetes/multicloud/components/multicloud-k8s/templates/deployment.yaml
@@ -45,6 +45,13 @@ spec:
             port: {{ .Values.service.internalPort }}
           initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
           periodSeconds: {{ .Values.readiness.periodSeconds }}
+        env:
+        - name: TRACING_ENABLED
+          value: {{ .Values.global.tracing.enabled | quote }}
+        - name: OTEL_SERVICE_NAME
+          value: "multicloud-k8s"
+        - name: OTEL_EXPORTER_OTLP_ENDPOINT
+          value: "{{ .Values.global.tracing.collector.baseUrl }}:{{ .Values.global.tracing.collector.port.otlpGrpc }}"
         volumeMounts:
         - mountPath: /tmp
           name: tmp-dir-k8s

diff --git a/kubernetes/multicloud/components/multicloud-k8s/values.yaml b/kubernetes/multicloud/components/multicloud-k8s/values.yaml
index 0bf8e37..b09f546 100644 (file)
--- a/kubernetes/multicloud/components/multicloud-k8s/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-k8s/values.yaml
@@ -33,7 +33,7 @@ global:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/multicloud/k8s:0.10.3
+image: onap/multicloud/k8s:0.11.0
 pullPolicy: Always
 
 # Strimzi KafkaUser config

diff --git a/kubernetes/multicloud/values.yaml b/kubernetes/multicloud/values.yaml
index 900354c..c666382 100644 (file)
--- a/kubernetes/multicloud/values.yaml
+++ b/kubernetes/multicloud/values.yaml
@@ -23,6 +23,11 @@ global:
     enabled: false
   persistence: {}
   centralizedLoggingEnabled: true
+  tracing:
+    collector:
+      baseUrl: http://jaeger-collector.istio-config
+      port:
+        otlpGrpc: 4317
 
 #################################################################
 # Application configuration defaults.