diff --git a/mviewer/Chart.yaml b/mviewer/Chart.yaml index 1108b47..1fa18dc 100644 --- a/mviewer/Chart.yaml +++ b/mviewer/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: 0.4.5 +version: 0.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 diff --git a/mviewer/templates/mviewerstudio-deployment.yaml b/mviewer/templates/mviewerstudio-deployment.yaml index b3dafe4..88c7f06 100644 --- a/mviewer/templates/mviewerstudio-deployment.yaml +++ b/mviewer/templates/mviewerstudio-deployment.yaml @@ -88,7 +88,7 @@ spec: volumeMounts: - name: mviewer-conf mountPath: /home/apprunner/apps - - name: mviewerstudio-conf + - name: mviewerstudio-static-apps mountPath: /home/apprunner/mviewerstudio_backend/static/apps {{- if $webapp.extraVolumeMounts }} {{- $webapp.extraVolumeMounts | toYaml | nindent 10 }} @@ -97,10 +97,10 @@ spec: - name: mviewer-conf persistentVolumeClaim: claimName: {{ include "mviewer.fullname" . }}-mviewer-conf - - name: mviewerstudio-conf - # Persistent storage for conf + - name: mviewerstudio-static-apps + # Persistent storage for static/apps folder persistentVolumeClaim: - claimName: {{ include "mviewer.fullname" . }}-mviewerstudio-conf + claimName: {{ include "mviewer.fullname" . }}-studio-static-apps - name: mviewerstudio-conf-json # initial config file configMap: diff --git a/mviewer/templates/mviewerstudio-pvc.yaml b/mviewer/templates/mviewerstudio-pvc.yaml index 0516100..8ac2037 100644 --- a/mviewer/templates/mviewerstudio-pvc.yaml +++ b/mviewer/templates/mviewerstudio-pvc.yaml @@ -3,8 +3,8 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: - name: {{ include "mviewer.fullname" . }}-mviewerstudio-conf - {{- with $webapp.persistence.mviewerstudio_conf.annotations }} + name: {{ include "mviewer.fullname" . }}-studio-static-apps + {{- with $webapp.persistence.mviewerstudio_static_apps.annotations }} annotations: {{- range $key, $value := . }} {{ $key }}: {{ $value }} @@ -15,20 +15,20 @@ metadata: app.kubernetes.io/component: {{ include "mviewer.fullname" . }}-mviewerstudio spec: accessModes: - {{- range $webapp.persistence.mviewerstudio_conf.accessModes }} + {{- range $webapp.persistence.mviewerstudio_static_apps.accessModes }} - {{ . | quote }} {{- end }} resources: requests: - storage: {{ $webapp.persistence.mviewerstudio_conf.size }} - {{- if $webapp.persistence.mviewerstudio_conf.storageClass }} - {{- if eq "-" $webapp.persistence.mviewerstudio_conf.storageClass }} + storage: {{ $webapp.persistence.mviewerstudio_static_apps.size }} + {{- if $webapp.persistence.mviewerstudio_static_apps.storageClass }} + {{- if eq "-" $webapp.persistence.mviewerstudio_static_apps.storageClass }} storageClassName: "" {{- else }} - storageClassName: {{ $webapp.persistence.mviewerstudio_conf.storageClass }} + storageClassName: {{ $webapp.persistence.mviewerstudio_static_apps.storageClass }} {{- end }} {{- end }} - {{- if $webapp.persistence.mviewerstudio_conf.existingPV }} - volumeName: {{ $webapp.persistence.mviewerstudio_conf.existingPV }} + {{- if $webapp.persistence.mviewerstudio_static_apps.existingPV }} + volumeName: {{ $webapp.persistence.mviewerstudio_static_apps.existingPV }} {{- end }} {{- end }} diff --git a/mviewer/values.yaml b/mviewer/values.yaml index 405f05c..acc6558 100644 --- a/mviewer/values.yaml +++ b/mviewer/values.yaml @@ -139,7 +139,7 @@ mviewerstudio: extraVolumeMounts: [] extraEnv: {} persistence: - mviewerstudio_conf: + mviewerstudio_static_apps: annotations: helm.sh/resource-policy: keep # existingPV: mviewer-conf