[MULTICLOUD] 15.0.4 release

- update multicloud/k8s (0.10.1 -> 0.10.2)
- update multicloud/framework-artifactbroker (1.9.2 -> 1.9.3)
- do not define framework-artifactbroker image in globals

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

diff --git a/kubernetes/multicloud/Chart.yaml b/kubernetes/multicloud/Chart.yaml
index 89bdbe7..791e02d 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.3
+version: 15.0.4
 
 dependencies:
   - name: common

diff --git a/kubernetes/multicloud/components/multicloud-k8s/Chart.yaml b/kubernetes/multicloud/components/multicloud-k8s/Chart.yaml
index 9e56446..bbfb0ba 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.3
+version: 13.1.4
 
 dependencies:
   - name: common

diff --git a/kubernetes/multicloud/components/multicloud-k8s/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-k8s/templates/deployment.yaml
index 6ed5dee..6718015 100644 (file)
--- a/kubernetes/multicloud/components/multicloud-k8s/templates/deployment.yaml
+++ b/kubernetes/multicloud/components/multicloud-k8s/templates/deployment.yaml
@@ -60,7 +60,7 @@ spec:
         affinity:
 {{ toYaml .Values.affinity | indent 10 }}
         {{- end }}
-      - image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.global.artifactImage }}
+      - image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.artifactbroker.image }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         name: framework-artifactbroker
         command: ["/opt/app/distribution/bin/artifact-dist.sh"]

diff --git a/kubernetes/multicloud/components/multicloud-k8s/values.yaml b/kubernetes/multicloud/components/multicloud-k8s/values.yaml
index 02509e6..dc62cca 100644 (file)
--- a/kubernetes/multicloud/components/multicloud-k8s/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-k8s/values.yaml
@@ -19,7 +19,6 @@
 global:
   nodePortPrefixExt: 304
   persistence: {}
-  artifactImage: onap/multicloud/framework-artifactbroker:1.9.2
   # Docker Repository used by RepositoryGenerator
   dockerHubRepository: docker.io
   # Additions for MongoDB****************************
@@ -34,7 +33,7 @@ global:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/multicloud/k8s:0.10.1
+image: onap/multicloud/k8s:0.10.2-SNAPSHOT
 pullPolicy: Always
 
 # Strimzi KafkaUser config
@@ -167,6 +166,7 @@ persistence:
   mountSubPath: multicloud-k8s/data
 
 artifactbroker:
+  image: onap/multicloud/framework-artifactbroker:1.9.3-SNAPSHOT
   internalPort: 9014
 
 # Configure resource requests and limits

diff --git a/kubernetes/multicloud/values.yaml b/kubernetes/multicloud/values.yaml
index 6193fb0..900354c 100644 (file)
--- a/kubernetes/multicloud/values.yaml
+++ b/kubernetes/multicloud/values.yaml
@@ -19,7 +19,6 @@
 #################################################################
 global:
   nodePortPrefix: 302
-  artifactImage: onap/multicloud/framework-artifactbroker:1.9.2
   prometheus:
     enabled: false
   persistence: {}