updates

AB-Lindex · Feb 9, 2024 · 0fe3c9a · 0fe3c9a
1 parent 8f4e392
commit 0fe3c9a
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 54 deletions.
diff --git a/charts/enactor-pdp/templates/_helpers.tpl b/charts/enactor-pdp/templates/_helpers.tpl
@@ -80,3 +80,15 @@ Create image
 {{- define "image" -}}
 {{ .repository }}:{{ .tag_override | default .tag | default  "latest" }}
 {{- end }}
+
+
+{{/*
+Renders a complete tree, even values that contains template.
+*/}}
+{{- define "render" -}}
+  {{- if typeIs "string" .value }}
+    {{- tpl .value .context }}
+  {{ else }}
+    {{- tpl (.value | toYaml) .context }}
+  {{- end }}
+{{- end -}}
diff --git a/charts/enactor-pdp/templates/configmap-common.yaml b/charts/enactor-pdp/templates/configmap-common.yaml
@@ -7,8 +7,10 @@ data:
   JAVA_COUNTRY: {{ .Values.java.country }}
   JAVA_LANGUAGE:  {{ .Values.java.language }}
   JTIMEZONE:  {{ .Values.java.timezone }}
+{{/*
   # JMPS: 512m
   # JXMS: 512m
   # JXMX: 768m
   # JAVA_HOME: /enactor/shared/java/jdk1.8.0_232
-  # JRE_HOME: /enactor/shared/java/jdk1.8.0_232
+  # JRE_HOME: /enactor/shared/java/jdk1.8.0_232
+*/}}
diff --git a/charts/enactor-pdp/templates/extra-manifests.yaml b/charts/enactor-pdp/templates/extra-manifests.yaml
@@ -0,0 +1,4 @@
+{{- range .Values.extraObjects }}
+---
+{{ include "render" (dict "value" . "context" $) }}
+{{- end }}
diff --git a/charts/enactor-pdp/templates/service-pdc.yaml b/charts/enactor-pdp/templates/service-pdc.yaml
@@ -14,10 +14,10 @@ spec:
       targetPort: pdc-7776
       protocol: TCP
       name: pdc-7776
-    - port: 7775
-      targetPort: pdc-7775
-      protocol: TCP
-      name: pdc-7775
+#     - port: 7775
+#       targetPort: pdc-7775
+#       protocol: TCP
+#       name: pdc-7775
     - port: 7777
       targetPort: pdc-7777
       protocol: TCP

diff --git a/charts/enactor-pdp/templates/statefulset-pdc.yaml b/charts/enactor-pdp/templates/statefulset-pdc.yaml
@@ -33,29 +33,17 @@ spec:
 
       enableServiceLinks: false
 
-      # securityContext:
-      #     runAsUser: 1100
-      #     runAsGroup: 1100
-      #     fsGroup: 1100
-
-#      hostAliases:
-#        - ip: "127.0.0.1"
-#          hostnames:
-#            - "localhost"
-#            - "{{ $root.Values.pdc.name }}"
-
       containers:
         - name: pdc
-#          image: {{ $root.Values.pdc.image.repository }}:{{ $root.Values.pdc.image.tag | default  "latest" }}
           image: {{ include "image" $root.Values.pdc.image }}
           imagePullPolicy: {{ $root.Values.pdc.image.pullPolicy  }}
           ports:
-            - containerPort: 8080
-              name: pdc-http
-            - containerPort: 2099
-              name: pdc-2099
-            - containerPort: 7775
-              name: pdc-7775
+            #- containerPort: 8080
+            #  name: pdc-http
+            #- containerPort: 2099
+            #  name: pdc-2099
+            #- containerPort: 7775
+            #  name: pdc-7775
             - containerPort: 7776
               name: pdc-7776
             - containerPort: 7777
@@ -73,26 +61,10 @@ spec:
             - configMapRef:
                 name: config-{{ $root.Values.pdc.name }}
 
-          # readinessProbe:
-          #   httpGet:
-          #     path: /WebMaintenance/
-          #     port: 39830
-
           volumeMounts:
             - name: pdc-db
               mountPath: /enactor/pdc/database
-            # - name: enactor-config
-            #   mountPath: /enactor/app/config/enactor.xml
-            #   subPath: enactor.xml
 
-      volumes:
-      #   - name: keystore
-      #     secret:
-      #       secretName: {{ $root.Release.Name }}-keystore
-        # - name: enactor-config
-        #   configMap:
-        #     name: {{ $root.Release.Name }}-enactor-config
-
   volumeClaimTemplates:
     - metadata:
         name: pdc-db

diff --git a/charts/enactor-pdp/templates/statefulset-pdp.yaml b/charts/enactor-pdp/templates/statefulset-pdp.yaml
@@ -52,7 +52,6 @@ spec:
 
       containers:
         - name: pdp
-#          image: {{ $root.Values.pdp.image.repository }}:{{ $root.Values.pdp.image.tag | default  "latest" }}
           image: {{ include "image" $root.Values.pdp.image }}
           imagePullPolicy: {{ $root.Values.pdp.image.pullPolicy  }}
           ports:
@@ -64,6 +63,27 @@ spec:
               name: jmx
             - containerPort: 39848
               name: pdp-jmx
+            - containerPort: 8080
+              name: health
+
+          livenessProbe:
+            httpGet:
+              path: /live
+              port: health
+            initialDelaySeconds: 60
+            periodSeconds: 15
+            timeoutSeconds: 5
+            failureThreshold: 3
+
+          readinessProbe:
+            httpGet:
+              path: /ready
+              port: health
+            initialDelaySeconds: 60
+            periodSeconds: 15
+            timeoutSeconds: 5
+            failureThreshold: 3
+
           env:
             {{- include "env.defaults" $root | nindent 12 }}
             {{- include "env.pdp" $root | nindent 12 }}
@@ -83,30 +103,16 @@ spec:
             - secretRef:
                 name: secret-common
 
-          # readinessProbe:
-          #   httpGet:
-          #     path: /WebMaintenance/
-          #     port: 39830
-
           volumeMounts:
             - name: pdp-home
               mountPath: /enactor/app/home
             - name: truststore
               mountPath: /enactor/app/custom/trust
-            # - name: enactor-config
-            #   mountPath: /enactor/app/config/enactor.xml
-            #   subPath: enactor.xml
 
       volumes:
         - name: truststore
           secret:
             secretName: {{ $root.Values.truststore.certSecret }}
-      #   - name: keystore
-      #     secret:
-      #       secretName: {{ $root.Release.Name }}-keystore
-        # - name: enactor-config
-        #   configMap:
-        #     name: {{ $root.Release.Name }}-enactor-config
 
   volumeClaimTemplates:
     - metadata:

diff --git a/charts/enactor-pdp/values.yaml b/charts/enactor-pdp/values.yaml
@@ -1,6 +1,7 @@
 # Default values for enactor-pdp.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
+
 dns:
   domain: my.fqdn.address
   ems: ems
@@ -71,6 +72,8 @@ pdc:
     storageClass: null
     size: "10Gi"
 
+extraObjects: []
+
 # image:
 #   repository: nginx
 #   pullPolicy: IfNotPresent