From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Mon, 10 Jan 2022 13:20:26 +0000 (+0000)
Subject: Merge "[A1POLICYMANAGEMENT] Fix missing imagePullSecrets" into istanbul
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=f25898995abed7dee4465a5282e1da5330675399;hp=a9c22862a4c7b05ef995f53094c83d17b9a11ff7;p=oom.git

Merge "[A1POLICYMANAGEMENT] Fix missing imagePullSecrets" into istanbul
---

diff --git a/kubernetes/common/mongo/templates/statefulset.yaml b/kubernetes/common/mongo/templates/statefulset.yaml
index 11602054e8..e156db27db 100644
--- a/kubernetes/common/mongo/templates/statefulset.yaml
+++ b/kubernetes/common/mongo/templates/statefulset.yaml
@@ -39,6 +39,23 @@ spec:
 {{ include "common.podSecurityContext" . | indent 6 }}
       imagePullSecrets:
       - name: "{{ include "common.namespace" . }}-docker-registry-key"
+      initContainers:
+        # we shouldn't need this but for unknown reason, it's fsGroup is not
+        # applied
+        - name: fix-permission
+          command:
+            - /bin/sh
+          args:
+            - -c
+            - |
+              chown -R {{ .Values.securityContext.user_id }}:{{ .Values.securityContext.group_id }} /data
+          image: {{ include "repositoryGenerator.image.busybox" . }}
+          imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+          securityContext:
+            runAsUser: 0
+          volumeMounts:
+            - name: {{ include "common.fullname" . }}-data
+              mountPath: /data
       containers:
         - name: {{ include "common.name" . }}
           image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.image }}
@@ -72,7 +89,7 @@ spec:
             periodSeconds: {{ .Values.readiness.periodSeconds }}
           volumeMounts:
           - name: {{ include "common.fullname" . }}-data
-            mountPath: /var/lib/mongo
+            mountPath: /data/db
           resources: {{ include "common.resources" . | nindent 12 }}
 {{ include "common.containerSecurityContext" . | indent 10 }}
         {{- if .Values.nodeSelector }}
diff --git a/kubernetes/cps/components/cps-core/values.yaml b/kubernetes/cps/components/cps-core/values.yaml
index a482152582..05f51ed9ed 100644
--- a/kubernetes/cps/components/cps-core/values.yaml
+++ b/kubernetes/cps/components/cps-core/values.yaml
@@ -63,7 +63,7 @@ global:
     container:
       name: postgres
 
-image: onap/cps-and-ncmp:2.0.1
+image: onap/cps-and-ncmp:2.0.2
 containerPort: &svc_port 8080
 managementPort: &mgt_port 8081
 
diff --git a/kubernetes/dcaegen2-services/components/dcae-restconf-collector/values.yaml b/kubernetes/dcaegen2-services/components/dcae-restconf-collector/values.yaml
index ad29e33a90..66c781cb3b 100644
--- a/kubernetes/dcaegen2-services/components/dcae-restconf-collector/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-restconf-collector/values.yaml
@@ -107,6 +107,10 @@ credentials:
   uid: *controllerCredsUID
   key: password
 
+# application environments
+applicationEnv:
+  LOG4J_FORMAT_MSG_NO_LOOKUPS: 'true'
+
 # Initial Application Configuration
 applicationConfig:
   collector.rcc.appDescription: DCAE RestConf Collector Application
diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-collector/values.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-collector/values.yaml
index f863ff8641..31007f2dde 100644
--- a/kubernetes/dcaegen2-services/components/dcae-ves-collector/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ves-collector/values.yaml
@@ -107,6 +107,7 @@ service:
 # application environments
 applicationEnv:
   CBS_CLIENT_CONFIG_PATH: '/app-config-input/application_config.yaml'
+  LOG4J_FORMAT_MSG_NO_LOOKUPS: 'true'
 
 # initial application configuration
 applicationConfig:
diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-mapper/values.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-mapper/values.yaml
index a7186a4d98..93214d3057 100644
--- a/kubernetes/dcaegen2-services/components/dcae-ves-mapper/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ves-mapper/values.yaml
@@ -70,6 +70,9 @@ service:
       port: 80
       port_protocol: http
 
+# application environments
+applicationEnv:
+  LOG4J_FORMAT_MSG_NO_LOOKUPS: 'true'
 
 # Initial Application Configuration
 applicationConfig: