Merge pull request #10 from HomeDevopsLab/9-common-shared-storage-path

9 common shared storage path

Author: kkrolikowski

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [2.5.0] - 2024-09-01
+
+### Added
+
+- common rootdir on shared storage
+
 ## [2.4.0] - 2024-08-24
 
 ### Added

chart/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.4.0
+version: 2.5.0
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.

chart/templates/deployment.yaml

@@ -107,7 +107,11 @@ spec:
           {{- if .Values.volumes.type.nfs }}
           nfs:
             server: {{ .Values.volumes.type.nfs.server }}
+            {{- if .Values.volumes.rootDir }}
+            path: {{ .Values.volumes.type.nfs.path }}/{{ .Values.volumes.rootDir }}
+            {{- else }}
             path: {{ .Values.volumes.type.nfs.path }}/{{ .Release.Name }}
+            {{- end }}
             readOnly: false
           {{- else }}
           persistentVolumeClaim:

chart/templates/initWebsiteDir.yaml

@@ -32,8 +32,12 @@ spec:
             {{- range .Values.volumes.mountPath }}
             {{- $dirmap := regexSplit ":" . -1 -}}
             {{- $dir := slice $dirmap 0 1 | first -}}
+            {{- if $.Values.volumes.rootDir -}}
+            {{- $dirs_to_create = printf "%s %s/%s/%s" $dirs_to_create "/storage" $.Values.volumes.rootDir $dir }}
+            {{- else }}
             {{- $dirs_to_create = printf "%s %s/%s/%s" $dirs_to_create "/storage" $.Release.Name $dir }}
             {{- end }}
+            {{- end }}
             value: {{ $dirs_to_create }}
           - name: OWNERSHIP
             value: {{ .Values.volumes.ownership | default "root:root" }}
@@ -44,7 +48,7 @@ spec:
           args:
             - -c
             - >-
-                mkdir -p $(WEBSITE_DIRS);
+                mkdir -p $(WEBSITE_DIRS); chown -R $(OWNERSHIP) $(WEBSITE_DIRS);
       nodeSelector:
         {{- with .Values.nodeSelector }}
         {{- toYaml . | nindent 8 }}

chart/values.yaml

@@ -25,6 +25,7 @@ ingress:
   tls: {}
 volumes:
   enabled: false
+  rootDir: ""
   mountPath: []
   ownership: ""
   type: