Switch PVI PVC to runtime PVC (#2)

* another typo * create runtime pvc * fix mount points * remove incorrect Local traffic policy
epics-containers · Nov 11, 2023 · accadac · accadac
1 parent 0c9ac53
commit accadac
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 13 deletions.
diff --git a/Charts/beamline-chart/templates/_deployment.yaml b/Charts/beamline-chart/templates/_deployment.yaml
@@ -30,10 +30,10 @@ spec:
       hostNetwork: {{ .Values.hostNetwork }}
       terminationGracePeriodSeconds: 15 # nice to have quick restarts on IOCs
       volumes:
-        {{- if .Values.pviClaim }}
-        - name: pvi-volume
+        {{- if .Values.runtimeClaim }}
+        - name: runtime-volume
           persistentVolumeClaim:
-            claimName: {{ .Values.pvi }}
+            claimName: {{ .Values.runtimeClaim }}
         {{- end }}
         {{- if .Values.opisClaim }}
         - name: opis-volume
@@ -100,14 +100,14 @@ spec:
           mountPath: /nfsv2-tftp
           subPath: "{{ .Values.beamline }}/{{ .Values.ioc_name }}"
           {{- end }}
-        {{- if .Values.pviClaim }}
-        - name: pvi-volume
-          mountPath: /epics/pvi
+        {{- if .Values.runtimeClaim }}
+        - name: runtime-volume
+          mountPath: /epics/runtime
           subPath: "{{ .Values.ioc_name }}"
         {{- end }}
         {{- if .Values.opisClaim }}
         - name: opis-volume
-          mountPath: /epics/opis
+          mountPath: /epics/opi
           subPath: "{{ .Values.ioc_name }}"
         {{- end }}
         stdin: true

diff --git a/Charts/beamline-chart/values.yaml b/Charts/beamline-chart/values.yaml
@@ -70,8 +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 for holding runtime files for each IOC
+runtimeClaim:
 # use the shared PVC autosave files (comment out for no autosave)
 autosaveClaim:
 

diff --git a/Charts/opis/templates/deploy.yaml b/Charts/opis/templates/deploy.yaml
@@ -64,7 +64,6 @@ metadata:
     app: {{ .Values.beamline }}-opis
 spec:
   type: LoadBalancer
-  externalTrafficPolicy: Local
   ports:
     - name: http
       port: 80

diff --git a/Charts/shared/templates/deploy.yaml b/Charts/shared/templates/deploy.yaml
@@ -13,13 +13,13 @@ spec:
     requests:
       storage: 100Mi
 ---
-# PVC for shared PVI files
+# PVC for shared runtime files
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
-  name: {{ .Values.beamline }}-pvi-claim
+  name: {{ .Values.beamline }}-runtime-claim
   labels:
-    app: {{ .Values.beamline }}-pvi
+    app: {{ .Values.beamline }}-runtime
     beamline: {{ .Values.beamline }}
 spec:
   accessModes: