Merge pull request #248 from europeana/EA-3830-externalization-of-log…

…4j-config Ea 3830 externalization of log4j config
europeana · Apr 29, 2024 · df9f15f · df9f15f
2 parents 3a2ed16 + 16f05db
commit df9f15f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/k8s/base/deployment.yaml b/k8s/base/deployment.yaml
@@ -42,7 +42,14 @@ spec:
             mountPath: "/opt/app/config/set.user.properties"
             readOnly: true
             subPath: set.user.properties
+          - name: log4j-config
+            mountPath: "/opt/app/config/log4j2-spring.xml"
+            readOnly: true
+            subPath: log4j2-spring.xml
       volumes:
         - name: app-properties
           secret:
             secretName: set-api-properties
+        - name: log4j-config
+          configMap:
+            name: log4j2-properties
diff --git a/k8s/base/kustomization.yaml b/k8s/base/kustomization.yaml
@@ -10,4 +10,10 @@ labels:
 secretGenerator:
   - name: set-api-properties
     files:
-      - set.user.properties
+      - set.user.properties
+
+#generate config mapping for log4j2.xml file
+configMapGenerator:
+  - name: log4j2-properties
+    files:
+      - log4j2-spring.xml
diff --git a/k8s/overlays/cloud/deployment_patch.yaml.template b/k8s/overlays/cloud/deployment_patch.yaml.template
@@ -20,7 +20,8 @@ spec:
                      -Delastic.apm.application_packages=${ELASTIC_APP_PACKAGES}
                      -Delastic.apm.server_urls=${ELASTIC_APM_SERVERS}
                      -Delastic.apm.service_name=${APP_NAME}
-                     -Delastic.apm.environment=${K8S_NAMESPACE}"
+                     -Delastic.apm.environment=${K8S_NAMESPACE}
+                     -Dlogging.config=/opt/app/config/log4j2-spring.xml"
           resources:
             requests:
               memory: "${MEMORY_REQUEST}M"

diff --git a/...eb/src/main/resources/log4j2.xml.template → ...main/resources/log4j2-spring.xml.template b/...eb/src/main/resources/log4j2.xml.template → ...main/resources/log4j2-spring.xml.template