X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fpolicy%2Fcomponents%2Fpolicy-xacml-pdp%2Ftemplates%2Fdeployment.yaml;h=cda1aa4bae3d3a00e88ead1f42e54d48cccb2ca1;hb=refs%2Fheads%2Fmaster;hp=1bd94eed0bb58878ac3fe1741d64b7121d95155d;hpb=b3f16b98d487e878193023627fe55c6d1af99326;p=oom.git

diff --git a/kubernetes/policy/components/policy-xacml-pdp/templates/deployment.yaml b/kubernetes/policy/components/policy-xacml-pdp/templates/deployment.yaml
old mode 100755
new mode 100644
index 1bd94eed0b..cd23866263
--- a/kubernetes/policy/components/policy-xacml-pdp/templates/deployment.yaml
+++ b/kubernetes/policy/components/policy-xacml-pdp/templates/deployment.yaml
@@ -1,6 +1,8 @@
 {{/*
 #  ============LICENSE_START=======================================================
 #   Copyright (C) 2020 AT&T Intellectual Property.
+#   Modifications Copyright (C) 2024-2025 Nordix Foundation.
+#   Modifications Copyright © 2024-2025 Deutsche Telekom
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -23,30 +25,25 @@ kind: Deployment
 metadata: {{- include "common.resourceMetadata" . | nindent 2 }}
 spec:
   selector: {{- include "common.selectors" . | nindent 4 }}
+  {{- if not .Values.autoscaling.enabled }}
   replicas: {{ .Values.replicaCount }}
+  {{ end }}
+  strategy:
+    type: {{ .Values.updateStrategy.type }}
+    rollingUpdate:
+      maxUnavailable: {{ .Values.updateStrategy.maxUnavailable }}
+      maxSurge: {{ .Values.updateStrategy.maxSurge }}
   template:
     metadata: {{- include "common.templateMetadata" . | nindent 6 }}
     spec:
+      {{ include "common.podSecurityContext" . | indent 6 | trim }}
       initContainers:
-      - command:
-        - /app/ready.py
-        args:
-        - --job-name
-        - {{ include "common.release" . }}-policy-galera-config
-        env:
-        - name: NAMESPACE
-          valueFrom:
-            fieldRef:
-              apiVersion: v1
-              fieldPath: metadata.namespace
-        image: {{ include "repositoryGenerator.image.readiness" . }}
-        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-        name: {{ include "common.name" . }}-readiness
+      {{ include "common.readinessCheck.waitFor" . | nindent 6 }}
       - command:
         - sh
         args:
         - -c
-        - "cd /config-input && for PFILE in `ls -1`; do envsubst <${PFILE} >/config/${PFILE}; done"
+        - JAASLOGIN=`echo $JAASLOGIN | tr -d '"'`; cd /config-input && for PFILE in `ls -1`; do envsubst <${PFILE} >/config/${PFILE}; done
         env:
         - name: RESTSERVER_USER
           {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "restserver-creds" "key" "login") | indent 10 }}
@@ -60,6 +57,23 @@ spec:
           {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "db-secret" "key" "login") | indent 10 }}
         - name: SQL_PASSWORD
           {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "db-secret" "key" "password") | indent 10 }}
+        - name: JAASLOGIN
+          valueFrom:
+            secretKeyRef:
+              name: {{ include "common.name" . }}-ku
+              key: sasl.jaas.config
+        - name: KAFKA_URL
+          value: {{ include "common.release" . }}-{{ .Values.global.kafkaBootstrap }}
+        - name: POD_UID
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.uid
+        - name: SASL
+          value: {{ .Values.kafkaUser.authenticationType | upper }}
+        - name: GROUP_ID
+          value: {{ .Values.groupIdPrefix }}-$(POD_UID)
+        - name: PAP_TOPIC
+          value: {{ .Values.config.app.listener.policyPdpPapTopic }}
         volumeMounts:
         - mountPath: /config-input
           name: pdpxconfig
@@ -67,9 +81,11 @@ spec:
           name: pdpxconfig-processed
         image: {{ include "repositoryGenerator.image.envsubst" . }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+        {{ include "common.containerSecurityContext" . | indent 8 | trim }}
         name: {{ include "common.name" . }}-update-config
       containers:
         - name: {{ include "common.name" . }}
+          {{ include "common.containerSecurityContext" . | indent 10 | trim }}
           image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
           imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
           command: ["/opt/app/policy/pdpx/bin/policy-pdpx.sh"]
@@ -90,25 +106,87 @@ spec:
             initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
             periodSeconds: {{ .Values.readiness.periodSeconds }}
           volumeMounts:
+          - name: policy-guard
+            mountPath: /opt/app/policy/pdpx/apps/guard
+          - name: pdpxconfig-processed
+            mountPath: /opt/app/policy/pdpx/apps/guard/xacml.properties
+            subPath: xacml.properties
+          - name: policy-match
+            mountPath: /opt/app/policy/pdpx/apps/match
+          - name: pdpxconfig-processed
+            mountPath: /opt/app/policy/pdpx/apps/match/xacml.properties
+            subPath: xacml.properties
+          - name: policy-monitoring
+            mountPath: /opt/app/policy/pdpx/apps/monitoring
+          - name: pdpxconfig-processed
+            mountPath: /opt/app/policy/pdpx/apps/monitoring/xacml.properties
+            subPath: xacml.properties
+          - name: policy-naming
+            mountPath: /opt/app/policy/pdpx/apps/naming
+          - name: pdpxconfig-processed
+            mountPath: /opt/app/policy/pdpx/apps/naming/xacml.properties
+            subPath: xacml.properties
+          - name: policy-native
+            mountPath: /opt/app/policy/pdpx/apps/native
+          - name: pdpxconfig-processed
+            mountPath: /opt/app/policy/pdpx/apps/native/xacml.properties
+            subPath: xacml.properties
+          - name: policy-optimization
+            mountPath: /opt/app/policy/pdpx/apps/optimization
+          - name: pdpxconfig-processed
+            mountPath: /opt/app/policy/pdpx/apps/optimization/xacml.properties
+            subPath: xacml.properties
+          - name: logs
+            mountPath: /var/log/onap
+          - name: empty-dir
+            mountPath: /tmp
+            subPath: tmp-dir
+          - mountPath: /opt/app/policy/pdpx/etc/logback.xml
+            subPath: logback.xml
+            name: pdpxconfig-processed
+          - mountPath: /opt/app/policy/pdpx/etc/mounted
+            name: pdpxconfig-processed
           - mountPath: /etc/localtime
             name: localtime
             readOnly: true
-          - mountPath: /opt/app/policy/pdpx/etc/mounted
-            name: pdpxconfig-processed
           resources: {{ include "common.resources" . | nindent 12 }}
         {{- if .Values.nodeSelector }}
-        nodeSelector:
-{{ toYaml .Values.nodeSelector | indent 10 }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
         {{- end -}}
         {{- if .Values.affinity }}
-        affinity:
-{{ toYaml .Values.affinity | indent 10 }}
+      affinity:
+{{ toYaml .Values.affinity | indent 8 }}
         {{- end }}
       serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
       volumes:
+        - name: policy-guard
+          emptyDir:
+            sizeLimit: {{ .Values.dirSizes.policyDir.sizeLimit }}
+        - name: policy-match
+          emptyDir:
+            sizeLimit: {{ .Values.dirSizes.policyDir.sizeLimit }}
+        - name: policy-monitoring
+          emptyDir:
+            sizeLimit: {{ .Values.dirSizes.policyDir.sizeLimit }}
+        - name: policy-naming
+          emptyDir:
+            sizeLimit: {{ .Values.dirSizes.policyDir.sizeLimit }}
+        - name: policy-native
+          emptyDir:
+            sizeLimit: {{ .Values.dirSizes.policyDir.sizeLimit }}
+        - name: policy-optimization
+          emptyDir:
+            sizeLimit: {{ .Values.dirSizes.policyDir.sizeLimit }}
+        - name: empty-dir
+          emptyDir:
+            sizeLimit: {{ .Values.dirSizes.emptyDir.sizeLimit }}
+        - name: logs
+          emptyDir:
+            sizeLimit: {{ .Values.dirSizes.logDir.sizeLimit }}
         - name: localtime
-          hostPath:
-             path: /etc/localtime
+          emptyDir:
+            sizeLimit: {{ .Values.dirSizes.emptyDir.sizeLimit }}
         - name: pdpxconfig
           configMap:
             name: {{ include "common.fullname" . }}-configmap
@@ -116,5 +194,5 @@ spec:
         - name: pdpxconfig-processed
           emptyDir:
             medium: Memory
-      imagePullSecrets:
-      - name: "{{ include "common.namespace" . }}-docker-registry-key"
+            sizeLimit: 64Mi
+      {{- include "common.imagePullSecrets" . | nindent 6 }}