From df4fc03d8540b4c1ee10b440b4f7d5b20d8e2685 Mon Sep 17 00:00:00 2001
From: Bin Yang <bin.yang@windriver.com>
Date: Tue, 22 Mar 2022 16:08:22 +0800
Subject: [MULTICLOUD] Changes for Jakarta release

Rebase and remove packages which has GPLv3 dependency issue
Update log to redirect to stdout

Issue-ID: MULTICLOUD-1224
Issue-ID: MULTICLOUD-1450
Signed-off-by: Bin Yang <bin.yang@windriver.com>
Change-Id: Id850bbe9cd51a4bce6eb0fe0cfc8274b04acf41e
---
 .../multicloud-starlingx/resources/config/log/log.yml      | 14 +++++++++-----
 .../multicloud-starlingx/templates/deployment.yaml         |  3 +++
 .../multicloud/components/multicloud-starlingx/values.yaml |  7 +++++--
 3 files changed, 17 insertions(+), 7 deletions(-)

(limited to 'kubernetes/multicloud/components/multicloud-starlingx')

diff --git a/kubernetes/multicloud/components/multicloud-starlingx/resources/config/log/log.yml b/kubernetes/multicloud/components/multicloud-starlingx/resources/config/log/log.yml
index 05989ac9b4..243e51e665 100644
--- a/kubernetes/multicloud/components/multicloud-starlingx/resources/config/log/log.yml
+++ b/kubernetes/multicloud/components/multicloud-starlingx/resources/config/log/log.yml
@@ -18,24 +18,28 @@ disable_existing_loggers: False
 
 loggers:
     starlingx_base:
-      handlers: [starlingx_handler]
+      handlers: [console_handler, file_handler]
       level: "DEBUG"
       propagate: False
     starlingx:
-      handlers: [starlingx_handler]
+      handlers: [console_handler, file_handler]
       level: "DEBUG"
       propagate: False
     newton_base:
-      handlers: [starlingx_handler]
+      handlers: [console_handler, file_handler]
       level: "DEBUG"
       propagate: False
     common:
-      handlers: [starlingx_handler]
+      handlers: [console_handler, file_handler]
       level: "DEBUG"
       propagate: False
 
 handlers:
-    starlingx_handler:
+    console_handler:
+        level: "DEBUG"
+        class: "logging.StreamHandler"
+        formatter: "standard"
+    file_handler:
         level: "DEBUG"
         class: "logging.handlers.RotatingFileHandler"
         filename: "/var/log/onap/multicloud/openstack/starlingx/starlingx.log"
diff --git a/kubernetes/multicloud/components/multicloud-starlingx/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-starlingx/templates/deployment.yaml
index c9209a0c09..2524cd8421 100644
--- a/kubernetes/multicloud/components/multicloud-starlingx/templates/deployment.yaml
+++ b/kubernetes/multicloud/components/multicloud-starlingx/templates/deployment.yaml
@@ -88,6 +88,9 @@ spec:
         {{ end }}
       # side car containers
       {{ include "common.log.sidecar" . | nindent 7 }}
+      - image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.memcached }}
+        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+        name: memcached
       - image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.global.artifactImage }}
         name: framework-artifactbroker
         command: ["/opt/app/distribution/bin/artifact-dist.sh"]
diff --git a/kubernetes/multicloud/components/multicloud-starlingx/values.yaml b/kubernetes/multicloud/components/multicloud-starlingx/values.yaml
index b3387c6c3a..e59f34a8bc 100644
--- a/kubernetes/multicloud/components/multicloud-starlingx/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-starlingx/values.yaml
@@ -17,14 +17,14 @@
 #################################################################
 global:
   nodePortPrefixExt: 304
-  artifactImage: onap/multicloud/framework-artifactbroker:1.7.2
+  artifactImage: onap/multicloud/framework-artifactbroker:1.7.3
 
 #################################################################
 # Application configuration defaults.
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/multicloud/openstack-starlingx:1.5.6
+image: onap/multicloud/openstack-starlingx:1.5.7
 pullPolicy: Always
 
 #Istio sidecar injection policy
@@ -89,6 +89,9 @@ resources:
       memory: 2Gi
   unlimited: {}
 
+# memcached image resource
+memcached: memcached:alpine3.15
+
 #Pods Service Account
 serviceAccount:
   nameOverride: multicloud-starlingx
-- 
cgit 1.2.3-korg