[DSD-5871] Updated dslorchestrator & packetcreator helm chart

Signed-off-by: syed salman <[email protected]>
mosip · Aug 2, 2024 · c370899 · c370899
1 parent 0c3b70c
commit c370899
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 156 deletions.
diff --git a/charts/dslorchestrator/templates/cronjob.yaml b/charts/dslorchestrator/templates/cronjob.yaml
@@ -157,7 +157,7 @@ spec:
           {{- if $.Values.persistence.enabled }}
           - name: {{ template "common.names.fullname" $ }}
             persistentVolumeClaim:
-              claimName: {{ template "common.names.fullname" $ }}-pvc
+              claimName: {{ template "common.names.fullname" $ }}
           {{- end }}
           {{- if $.Values.enable_insecure }}
           - name: cacerts

diff --git a/charts/dslorchestrator/templates/dslorchestrator-data-pv-pvc.yaml b/charts/dslorchestrator/templates/dslorchestrator-data-pv-pvc.yaml
diff --git a/charts/dslorchestrator/templates/pvc.yaml b/charts/dslorchestrator/templates/pvc.yaml
@@ -0,0 +1,22 @@
+{{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) }}
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: {{ template "common.names.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
+  labels: {{- include "common.labels.standard" . | nindent 4 }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+spec:
+  accessModes:
+  {{- if not (empty .Values.persistence.accessModes) }}
+  {{- range .Values.persistence.accessModes }}
+  - {{ . | quote }}
+  {{- end }}
+  {{- else }}
+  - {{ .Values.persistence.accessMode | quote }}
+  {{- end }}
+  resources:
+    requests:
+      storage: {{ .Values.persistence.size | quote }}
+  {{- include "common.storage.class" (dict "persistence" .Values.persistence "global" .Values.global) | nindent 2 }}
+  {{- end }}
diff --git a/charts/dslorchestrator/values.yaml b/charts/dslorchestrator/values.yaml
@@ -480,7 +480,6 @@ dslorchestrator:
       ENABLE_INSECURE: "false"
       ENDPOINT: "https://api-internal.sandbox.xyz.net"
       USER: "api-internal.sandbox.xyz.net"
-      authCertsPath: "/home/mosip/authcerts"
       # dslorchestrator scenario mountPath
       mountPathForScenario: "/home/mosip/mountvolume/"
       mountPath: "/home/mosip/mountvolume"

diff --git a/charts/packetcreator/templates/authdemo-authcerts-pv-pvc.yaml b/charts/packetcreator/templates/authdemo-authcerts-pv-pvc.yaml
diff --git a/charts/packetcreator/templates/deployment.yaml b/charts/packetcreator/templates/deployment.yaml
@@ -61,16 +61,14 @@ spec:
           command:
             - /bin/bash
             - -c
-            - chown -R mosip:mosip {{ .Values.persistence.mountDir }} && chown -R mosip:mosip {{ .Values.persistence.packetcreator_data_mount_dir }}
+            - chown -R mosip:mosip {{ .Values.persistence.packetcreator_data_mount_dir }}
           securityContext:
             runAsUser: 0
           {{- if .Values.volumePermissions.resources }}
           resources: {{- toYaml .Values.volumePermissions.resources | nindent 12 }}
           {{- end }}
           volumeMounts:
-            - name: {{ template "common.names.fullname" . }}-authcerts
-              mountPath: {{ .Values.persistence.mountDir }}
-            - name: {{ template "common.names.fullname" . }}-data
+            - name: {{ template "common.names.fullname" . }}
               mountPath: {{ .Values.persistence.packetcreator_data_mount_dir }}
         {{- end }}
         {{- if .Values.enable_insecure }}
@@ -120,9 +118,7 @@ spec:
           resources: {{- toYaml .Values.resources | nindent 12 }}
           {{- end }}
           volumeMounts:
-            - name: {{ template "common.names.fullname" . }}-authcerts
-              mountPath: {{ .Values.persistence.mountDir }}
-            - name: {{ template "common.names.fullname" . }}-data
+            - name: {{ template "common.names.fullname" . }}
               mountPath: {{ .Values.persistence.packetcreator_data_mount_dir }}
             {{- if .Values.enable_insecure }}
             - mountPath: /usr/local/openjdk-11/lib/security/cacerts
@@ -149,12 +145,9 @@ spec:
         {{- end }}
       volumes:
       {{- if .Values.persistence.enabled }}
-        - name: {{ template "common.names.fullname" . }}-authcerts
+        - name: {{ template "common.names.fullname" . }}
           persistentVolumeClaim:
-            claimName: {{ template "common.names.fullname" . }}-authcerts-pvc
-        - name: {{ template "common.names.fullname" . }}-data
-          persistentVolumeClaim:
-            claimName: {{ template "common.names.fullname" . }}-data-pvc
+            claimName: {{ template "common.names.fullname" . }}
       {{- end }}
       {{- if .Values.enable_insecure }}
         - name: cacerts

diff --git a/charts/packetcreator/templates/packetcreator-data-pv-pvc.yaml b/charts/packetcreator/templates/packetcreator-data-pv-pvc.yaml
diff --git a/charts/packetcreator/templates/pvc.yaml b/charts/packetcreator/templates/pvc.yaml
@@ -0,0 +1,22 @@
+{{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) }}
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: {{ template "common.names.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
+  labels: {{- include "common.labels.standard" . | nindent 4 }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+spec:
+  accessModes:
+  {{- if not (empty .Values.persistence.accessModes) }}
+  {{- range .Values.persistence.accessModes }}
+  - {{ . | quote }}
+  {{- end }}
+  {{- else }}
+  - {{ .Values.persistence.accessMode | quote }}
+  {{- end }}
+  resources:
+    requests:
+      storage: {{ .Values.persistence.size | quote }}
+  {{- include "common.storage.class" (dict "persistence" .Values.persistence "global" .Values.global) | nindent 2 }}
+  {{- end }}
diff --git a/charts/packetcreator/values.yaml b/charts/packetcreator/values.yaml
@@ -333,13 +333,7 @@ persistence:
     - ReadWriteOnce
   size: 50G
   existingClaim:
-
-  nfs:
-    path: '/srv/nfs/mosip/packetcreator-authdemo-authcerts'
-    packetcreator_data_path: '/srv/nfs/mosip/packetcreator-data'
-    server: ''
   # Dir where config and keys are written inside container
-  mountDir: '/home/mosip/authcerts'
   packetcreator_data_mount_dir: '/home/mosip/mountvolume/'
 
 ## Init containers parameters:
@@ -450,7 +444,6 @@ metrics:
 packetcreator:
   configmaps:
     packetcreator:
-      authCertsPath: /home/mosip/authcerts
       mountPath: /home/mosip/mountvolume
   secrets: