avoid pvc naming conflicts

LiferayCloud · Feb 7, 2025 · 899af5a · 899af5a
1 parent 0ebdf1e
commit 899af5a
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 28 deletions.
diff --git a/templates/database/statefulset.yaml b/templates/database/statefulset.yaml
@@ -58,7 +58,7 @@ spec:
         {{- end }}
         volumeMounts:
         - mountPath: /var/lib/postgresql/data
-          name: liferay-database-pvc
+          name: {{ include "liferay.fullname" $ }}-database-pvc
       {{- with .internal.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
@@ -84,7 +84,7 @@ spec:
     type: RollingUpdate
   volumeClaimTemplates:
   - metadata:
-      name: liferay-database-pvc
+      name: {{ include "liferay.fullname" $ }}-database-pvc
     spec:
       accessModes: [ "ReadWriteOnce" ]
       resources:

diff --git a/templates/objectstorage/statefulset.yaml b/templates/objectstorage/statefulset.yaml
@@ -103,16 +103,16 @@ spec:
         {{- end }}
         volumeMounts:
         - mountPath: /tmp
-          name: liferay-objectstorage-pvc
+          name: {{ include "liferay.fullname" $ }}-objectstorage-pvc
           subPath: tmp-dir
         - mountPath: /opt/bitnami/minio/tmp
-          name: liferay-objectstorage-pvc
+          name: {{ include "liferay.fullname" $ }}-objectstorage-pvc
           subPath: app-tmp-dir
         - mountPath: /.mc
-          name: liferay-objectstorage-pvc
+          name: {{ include "liferay.fullname" $ }}-objectstorage-pvc
           subPath: app-mc-dir
         - mountPath: /bitnami/minio/data
-          name: liferay-objectstorage-pvc
+          name: {{ include "liferay.fullname" $ }}-objectstorage-pvc
           subPath: data-dir
       {{- with .internal.imagePullSecrets }}
       imagePullSecrets:
@@ -142,7 +142,7 @@ spec:
     type: RollingUpdate
   volumeClaimTemplates:
   - metadata:
-      name: liferay-objectstorage-pvc
+      name: {{ include "liferay.fullname" $ }}-objectstorage-pvc
     spec:
       accessModes: [ "ReadWriteOnce" ]
       resources:

diff --git a/templates/search/statefulset.yaml b/templates/search/statefulset.yaml
@@ -62,16 +62,16 @@ spec:
         {{- end }}
         volumeMounts:
         - mountPath: /usr/share/elasticsearch/config
-          name: liferay-search-pvc
+          name: {{ include "liferay.fullname" $ }}-search-pvc
           subPath: config
         - mountPath: /usr/share/elasticsearch/data
-          name: liferay-search-pvc
+          name: {{ include "liferay.fullname" $ }}-search-pvc
           subPath: data
         - mountPath: /usr/share/elasticsearch/logs
-          name: liferay-search-pvc
+          name: {{ include "liferay.fullname" $ }}-search-pvc
           subPath: logs
         - mountPath: /usr/share/elasticsearch/plugins
-          name: liferay-search-pvc
+          name: {{ include "liferay.fullname" $ }}-search-pvc
           subPath: plugins
       {{- with .internal.imagePullSecrets }}
       imagePullSecrets:
@@ -108,10 +108,10 @@ spec:
           find . -mtime -1 -ls
         volumeMounts:
         - mountPath: /usr/share/elasticsearch/plugins
-          name: liferay-search-pvc
+          name: {{ include "liferay.fullname" $ }}-search-pvc
           subPath: plugins
         - mountPath: /usr/share/elasticsearch/_config
-          name: liferay-search-pvc
+          name: {{ include "liferay.fullname" $ }}-search-pvc
           subPath: config
       {{- with .internal.initContainers -}}
       {{ toYaml . | nindent 6 }}
@@ -135,7 +135,7 @@ spec:
     type: RollingUpdate
   volumeClaimTemplates:
   - metadata:
-      name: liferay-search-pvc
+      name: {{ include "liferay.fullname" $ }}-search-pvc
     spec:
       accessModes: ["ReadWriteOnce"]
       resources:

diff --git a/templates/statefulset.yaml b/templates/statefulset.yaml
@@ -82,37 +82,37 @@ spec:
         # Mounts for liferay working directories allowing the
         # container's root file system to remain readonly.
         - mountPath: /opt/liferay/data
-          name: liferay-working-data-pvc
+          name: {{ include "liferay.fullname" $ }}-pvc
           subPath: liferay/data
         - mountPath: /opt/liferay/deploy
-          name: liferay-working-data-pvc
+          name: {{ include "liferay.fullname" $ }}-pvc
           subPath: liferay/deploy
         - mountPath: /opt/liferay/logs
-          name: liferay-working-data-pvc
+          name: {{ include "liferay.fullname" $ }}-pvc
           subPath: liferay/logs
         - mountPath: /opt/liferay/tomcat/temp
-          name: liferay-working-data-pvc
+          name: {{ include "liferay.fullname" $ }}-pvc
           subPath: tomcat/temp
         - mountPath: /opt/liferay/tomcat/logs
-          name: liferay-working-data-pvc
+          name: {{ include "liferay.fullname" $ }}-pvc
           subPath: tomcat/logs
         - mountPath: /opt/liferay/tomcat/work
-          name: liferay-working-data-pvc
+          name: {{ include "liferay.fullname" $ }}-pvc
           subPath: tomcat/work
         - mountPath: /opt/liferay/osgi/modules
-          name: liferay-working-data-pvc
+          name: {{ include "liferay.fullname" $ }}-pvc
           subPath: osgi/modules
         - mountPath: /opt/liferay/osgi/state
-          name: liferay-working-data-pvc
+          name: {{ include "liferay.fullname" $ }}-pvc
           subPath: osgi/state
         - mountPath: /opt/liferay/reports
-          name: liferay-working-data-pvc
+          name: {{ include "liferay.fullname" $ }}-pvc
           subPath: liferay/reports
         - mountPath: /opt/liferay/routes
-          name: liferay-working-data-pvc
+          name: {{ include "liferay.fullname" $ }}-pvc
           subPath: liferay/routes
         - mountPath: /opt/liferay/liferay.pid
-          name: liferay-working-data-pvc
+          name: {{ include "liferay.fullname" $ }}-pvc
           subPath: liferay/liferay.pid
 
         # Mounted configuration files
@@ -166,7 +166,7 @@ spec:
           cp -fv /opt/liferay/deploy/* /temp/liferay/deploy
         volumeMounts:
         - mountPath: /temp
-          name: liferay-working-data-pvc
+          name: {{ include "liferay.fullname" $ }}-pvc
       {{- if .Values.prePopulateDxpData }}
       - name: {{ .Chart.Name }}-pre-populate-dxp-data
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
@@ -199,7 +199,7 @@ spec:
 
         volumeMounts:
         - mountPath: /temp
-          name: liferay-working-data-pvc
+          name: {{ include "liferay.fullname" $ }}-pvc
       {{- end }}
       {{- with .Values.initContainers -}}
       {{ toYaml . | nindent 6 }}
@@ -261,7 +261,7 @@ spec:
     type: RollingUpdate
   volumeClaimTemplates:
   - metadata:
-      name: liferay-working-data-pvc
+      name: {{ include "liferay.fullname" $ }}-pvc
     spec:
       accessModes: [ "ReadWriteOnce" ]
       resources: