From 33cf8f6d8f3253e9c4680831c10353c8f07c383d Mon Sep 17 00:00:00 2001
From: Giles Knap <giles.knap@diamond.ac.uk>
Date: Thu, 9 Nov 2023 06:32:03 +0000
Subject: [PATCH] add pvis claim

---
 Charts/beamline-chart/Chart.yaml                 |  2 +-
 Charts/beamline-chart/templates/_deployment.yaml | 12 +++++++++++-
 Charts/beamline-chart/values.yaml                |  2 ++
 Charts/opis/Chart.yaml                           |  2 +-
 Charts/shared/Chart.yaml                         |  2 +-
 Charts/shared/templates/deploy.yaml              | 15 +++++++++++++++
 6 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/Charts/beamline-chart/Chart.yaml b/Charts/beamline-chart/Chart.yaml
index 2b2957a..3083a6f 100644
--- a/Charts/beamline-chart/Chart.yaml
+++ b/Charts/beamline-chart/Chart.yaml
@@ -2,6 +2,6 @@
 apiVersion: v2
 name: ioc-instance
 
-version: 1.0.0
+version: 1.0.1
 
 type: library
diff --git a/Charts/beamline-chart/templates/_deployment.yaml b/Charts/beamline-chart/templates/_deployment.yaml
index efd02f3..8f6efc7 100644
--- a/Charts/beamline-chart/templates/_deployment.yaml
+++ b/Charts/beamline-chart/templates/_deployment.yaml
@@ -30,6 +30,11 @@ spec:
       hostNetwork: {{ .Values.hostNetwork }}
       terminationGracePeriodSeconds: 15 # nice to have quick restarts on IOCs
       volumes:
+        {{- if .Values.pviClaim }}
+        - name: pvi-volume
+          persistentVolumeClaim:
+            claimName: {{ .Values.pvi }}
+        {{- end }}
         {{- if .Values.opisClaim }}
         - name: opis-volume
           persistentVolumeClaim:
@@ -95,11 +100,16 @@ spec:
           mountPath: /nfsv2-tftp
           subPath: "{{ .Values.beamline }}/{{ .Values.ioc_name }}"
           {{- end }}
+        {{- if .Values.pvisClaim }}
+        - name: pvis-volume
+          mountPath: /epics/pvis
+          subPath: "{{ .Values.ioc_name }}"
+        {{- end }}
         {{- if .Values.opisClaim }}
         - name: opis-volume
           mountPath: /epics/opis
           subPath: "{{ .Values.ioc_name }}"
-          {{- end }}
+        {{- end }}
         stdin: true
         tty: true
         securityContext:
diff --git a/Charts/beamline-chart/values.yaml b/Charts/beamline-chart/values.yaml
index 7d6b51f..f5d5ea9 100644
--- a/Charts/beamline-chart/values.yaml
+++ b/Charts/beamline-chart/values.yaml
@@ -70,6 +70,8 @@ dataVolume:
 
 # use the shared PVC for publishing opi files over http (see services/opis)
 opisClaim:
+# use the shared PVC for publishing pvi device files over http (see services/opis)
+pvisClaim:
 # use the shared PVC autosave files (comment out for no autosave)
 autosaveClaim:
 
diff --git a/Charts/opis/Chart.yaml b/Charts/opis/Chart.yaml
index ac14435..81ecd08 100644
--- a/Charts/opis/Chart.yaml
+++ b/Charts/opis/Chart.yaml
@@ -5,4 +5,4 @@ description: |
 
 type: application
 
-version: 1.0.0
+version: 1.0.1
diff --git a/Charts/shared/Chart.yaml b/Charts/shared/Chart.yaml
index 23f1218..329ce3c 100644
--- a/Charts/shared/Chart.yaml
+++ b/Charts/shared/Chart.yaml
@@ -9,4 +9,4 @@ description: |
 
 type: application
 
-version: 1.0.0
+version: 1.0.1
diff --git a/Charts/shared/templates/deploy.yaml b/Charts/shared/templates/deploy.yaml
index 0598290..c4ae5fc 100644
--- a/Charts/shared/templates/deploy.yaml
+++ b/Charts/shared/templates/deploy.yaml
@@ -13,6 +13,21 @@ spec:
     requests:
       storage: 100Mi
 ---
+# PVC for shared PVI files
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: {{ .Values.beamline }}-pvi-claim
+  labels:
+    app: {{ .Values.beamline }}-pvi
+    beamline: {{ .Values.beamline }}
+spec:
+  accessModes:
+    - ReadWriteMany
+  resources:
+    requests:
+      storage: 100Mi
+---
 # PVC for Autosave volumes
 kind: PersistentVolumeClaim
 apiVersion: v1