Merge pull request #7 from epics-containers/edge-containers

Restructure for new edge containers cli

.github/workflows/helm_deploy.yml

@@ -5,7 +5,7 @@ on:
   pull_request:
 
 env:
-  HELM_VERSION_TO_INSTALL: 3.13.1 # version of HELM to install
+  HELM_VERSION_TO_INSTALL: 3.13.2
 
 jobs:
   build-and-push-helm-charts:

Charts/opis/Chart.yaml → Charts/epics-opis/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
-name: domain-opis
+name: epics-opis
 description: |
   A service for sharing bob files to phoebus for all iocs on the beamline.
 
 type: application
 
-version: 1.0.2
+version: 2.0.0+b3

Charts/epics-opis/templates/deploy.yaml

@@ -0,0 +1,113 @@
+# a config map to contain nginx config - ingests the files in config folder
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name:  {{ .Release.Name }}-nginx-config
+  labels:
+    app: {{ .Release.Name }}
+    location: {{ .Values.location }}
+    ioc_group: {{ .Values.ioc_group }}
+data:
+{{ (.Files.Glob "config/*").AsConfig | indent 2 }}
+  version.txt: |
+    IOC {{ .Release.Name }} version {{ .Chart.AppVersion }}
+---
+kind: Deployment
+apiVersion: apps/v1
+metadata:
+  name: {{ .Release.Name }}
+  labels:
+    app: {{ .Release.Name }}
+    location: {{ .Values.location }}
+    ioc_group: {{ .Values.ioc_group }}
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ .Release.Name }}
+        location: {{ .Values.location }}
+        ioc_group: {{ .Values.ioc_group }}
+    spec:
+      volumes:
+        - name: html-volume
+          persistentVolumeClaim:
+            claimName: {{ .Values.ioc_group }}-opi-claim
+        - name: config-volume
+          configMap:
+            name: {{ .Release.Name }}-nginx-config
+      containers:
+        - name: server
+          image: {{ .Values.image }}
+          resources:
+            requests:
+              memory: 100Mi
+              cpu: 200m
+            limits:
+              memory: 500Mi
+              cpu: 600m
+          ports:
+            - containerPort: 90
+              protocol: TCP
+          volumeMounts:
+            # - mountPath: /opis
+            - mountPath: /usr/share/nginx/html
+              name: html-volume
+            # mount a config file over the default nginx config
+            - mountPath: /etc/nginx/nginx.conf
+              name: config-volume
+              subPath: nginx.conf
+      {{- if .Values.useAffinity }}
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+            {{ if .Values.beamline -}}
+            - matchExpressions:
+              - key: beamline
+                operator: In
+                values:
+                  - {{ .Values.beamline }}
+            {{- else -}}
+            - matchExpressions:
+              - key: location
+                operator: In
+                values:
+                  - {{ .Values.location }}
+            {{- end }}
+      {{- end }}
+      tolerations:
+        - key: beamline
+          operator: Equal
+          value: {{ .Values.beamline }}
+          effect: NoSchedule
+        - key: location
+          operator: Equal
+          value: {{ .Values.location }}
+          effect: NoSchedule
+      {{- if .Values.tolerations }}
+{{  toYaml .Values.tolerations | indent 8}}
+      {{- end }}
+
+---
+kind: Service
+apiVersion: v1
+metadata:
+  name: {{ .Release.Name }}
+  labels:
+    app: {{ .Release.Name }}
+    location: {{ .Values.location }}
+    ioc_group: {{ .Values.ioc_group }}
+spec:
+  type: LoadBalancer
+  ports:
+    - name: http
+      port: 80
+      protocol: TCP
+      targetPort: 8080
+  sessionAffinity: None
+  selector:
+    app: {{ .Release.Name }}

Charts/opis/values.yaml → Charts/epics-opis/values.yaml

@@ -1,4 +1,7 @@
 # use nginx for publishing opi files over http
 image: docker.io/nginxinc/nginx-unprivileged:stable-bullseye-perl
-beamline: bl38p
 
+# These are overridden per ioc_group repository
+beamline:
+location:
+ioc_group:

Charts/shared/Chart.yaml → Charts/epics-pvcs/Chart.yaml

@@ -3,10 +3,10 @@
 # EPICS services
 
 apiVersion: v2
-name: domain-shared-pvcs
+name: epics-pvcs
 description: |
   A set of PVCs to share between pods for a beamline/accelerator domain
 
 type: application
 
-version: 1.1.0
+version: 2.0.0+b3

Charts/shared/templates/deploy.yaml → Charts/epics-pvcs/templates/deploy.yaml

@@ -2,10 +2,11 @@
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
-  name: {{ .Values.beamline }}-opi-claim
+  name: {{ .Values.ioc_group }}-opi-claim
   labels:
-    app: {{ .Values.beamline }}-opi
-    beamline: {{ .Values.beamline }}
+    app: {{ .Release.Name }}
+    location: {{ .Values.location }}
+    ioc_group: {{ .Values.ioc_group }}
 spec:
   accessModes:
     - ReadWriteMany
@@ -17,10 +18,11 @@ spec:
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
-  name: {{ .Values.beamline }}-runtime-claim
+  name: {{ .Values.ioc_group }}-runtime-claim
   labels:
-    app: {{ .Values.beamline }}-runtime
-    beamline: {{ .Values.beamline }}
+    app: {{ .Release.Name }}
+    location: {{ .Values.location }}
+    ioc_group: {{ .Values.ioc_group }}
 spec:
   accessModes:
     - ReadWriteMany
@@ -32,10 +34,11 @@ spec:
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
-  name: {{ .Values.beamline }}-autosave-claim
+  name: {{ .Values.ioc_group }}-autosave-claim
   labels:
-    app: {{ .Values.beamline }}-autosave
-    beamline: {{ .Values.beamline }}
+    app: {{ .Release.Name }}
+    location: {{ .Values.location }}
+    ioc_group: {{ .Values.ioc_group }}
 spec:
   accessModes:
     - ReadWriteMany

Charts/epics-pvcs/values.yaml

@@ -0,0 +1,2 @@
+# this value must be overridden
+beamline:

Charts/ioc-instance/Chart.yaml

@@ -0,0 +1,7 @@
+# A Helm Chart for an IOC instance
+apiVersion: v2
+name: ioc-instance
+
+version: 2.0.0+b3
+
+type: application