Merge pull request #7 from epics-containers/update

Update to template 3.4.0
epics-containers · Mar 26, 2024 · 3fff47b · 3fff47b
2 parents f54af4c + 3a6535f
commit 3fff47b
Show file tree

Hide file tree

Showing 16 changed files with 95 additions and 27 deletions.
diff --git a/.copier-answers.yml b/.copier-answers.yml
@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
-_commit: 3.1.0
+_commit: 3.4.0
 _src_path: gh:epics-containers/ec-services-template
 beamline: bl47p
 cluster_name: pollux

diff --git a/helm/shared/Chart.yaml b/helm/shared/Chart.yaml
@@ -2,12 +2,12 @@
 apiVersion: v2
 name: shared
 
-version: 3.0.0
+version: 3.4.0
 
 type: application
 
 dependencies:
   - name: ioc-instance
-    version: "3.0.0"
+    version: "3.4.0"
     repository: "oci://ghcr.io/epics-containers"
     #repository: "file:///scratch/hgv27681/work/ec-helm-charts/Charts/ioc-instance"
diff --git a/helm/shared/values.yaml b/helm/shared/values.yaml
@@ -1,6 +1,5 @@
-# default values for all IOCs on bl47p beamline
+# default values for all IOCs on bl47p
 ioc-instance:
-
   # the beamline name - only set for beamlines
   beamline: bl47p
   # the location where the IOCs will run - same as beamline for beamlines
@@ -19,9 +18,8 @@ ioc-instance:
   # useAffinity - only run on nodes with label beamline:<beamline-name>
   # or location:<location-name>
   # Comment out useAffiniity for dedicated cluster, set to true for shared cluster
-  
+
   useAffinity: true
-
 
   # root folder for ioc source/binaries inside generic IOC container
   iocFolder: /epics/ioc
@@ -31,11 +29,31 @@ ioc-instance:
   stop: /epics/ioc/stop.sh
   liveness: /epics/ioc/liveness.sh
 
-  # The following are added to the pod's environment
-  # Add any environment variables as needed
-  globalenv:
-    - name: "EXAMPLE_ENV"
-      value: "example"
+  # The following are added to the pod's environment and are shared by all
+  # IOCs. TODO - these defaults are for a lab crate in DLS - if you have
+  # RTEMS IOCs update accordingly.
+  globalEnv:
+    # These variables are used by RTEMS IOCs to find the NFS and TFTP servers
+    - name: "RTEMS_ROOT_NFS"
+      value: "/nfsv2-tftp"
+    - name: "RTEMS_ROOT_TFTP"
+      value: "/nfsv2-tftp"
+    - name: "RTEMS_NFS_IP"
+      value: "172.23.90.238"
+    - name: "RTEMS_TFTP_IP"
+      value: "172.23.90.238"
+    # NB. Gateway and Netmask are the same for all RTEMS IOCs on a beamline
+    # But may need to move these to iocEnv for Machine IOCs?
+    - name: "RTEMS_IOC_NETMASK"
+      value: "255.255.240.0"
+    - name: "RTEMS_IOC_GATEWAY"
+      value: "172.23.240.254"
+  # This also adds environment variables to the pod, but this should be
+  # overridden by each IOC's values.yaml as needed. Don't set values in this
+  # file because they will be overridden by IOCs.
+  # iocEnv:
+  #   - name: ""
+  #     value: ""
 
   # defaults for securityContext
   # Usually override runAsXXX in the individual IOC values.yaml.
@@ -90,4 +108,3 @@ ioc-instance:
       operator: "Equal"
       value: "training-rig"
       effect: "NoSchedule"
-
diff --git a/include/iocs/Chart.yaml b/include/iocs/Chart.yaml
@@ -6,7 +6,7 @@ name: ioc-instance
 # via a symlink. When changes are made to the dependent charts, it is
 # necessary to update the version number here so that all IOC instances
 # show a change in the next commit.
-version: 3.0.0
+version: 3.4.0
 
 # When we deploy with the edge-containers-cli we override this on the command line.
 # Direct deployment with Helm will use the default beta value.This value should
@@ -17,5 +17,5 @@ type: application
 
 dependencies:
   - name: shared
-    version: "3.0.0"
+    version: "3.4.0"
     repository: file://../../helm/shared
diff --git a/services/bl47p-ea-dcam-01/config/ioc.yaml b/services/bl47p-ea-dcam-01/config/ioc.yaml
@@ -1,4 +1,4 @@
-# yaml-language-server: $schema=https://github.com/epics-containers/ioc-adaravis/releases/download/2024.1.2/ibek.ioc.schema.json
+# yaml-language-server: $schema=https://github.com/epics-containers/ioc-adaravis/releases/download/2024.4.2/ibek.ioc.schema.json
 
 ioc_name: "{{ __utils__.get_env('IOC_NAME') }}"
 

diff --git a/services/bl47p-ea-dcam-01/values.yaml b/services/bl47p-ea-dcam-01/values.yaml
@@ -1,4 +1,4 @@
 # latest container image for GigE cameras from the GitHub Container Registry
 shared:
   ioc-instance:
-    image: ghcr.io/epics-containers/ioc-adaravis-linux-runtime:2024.2.1
+    image: ghcr.io/epics-containers/ioc-adaravis-runtime:2024.4.2
diff --git a/services/bl47p-ea-dcam-02/config/ioc.yaml b/services/bl47p-ea-dcam-02/config/ioc.yaml
@@ -1,4 +1,4 @@
-# yaml-language-server: $schema=https://github.com/epics-containers/ioc-adaravis/releases/download/2024.1.2/ibek.ioc.schema.json
+# yaml-language-server: $schema=https://github.com/epics-containers/ioc-adaravis/releases/download/2024.4.2/ibek.ioc.schema.json
 
 ioc_name: "{{ __utils__.get_env('IOC_NAME') }}"
 

diff --git a/services/bl47p-ea-dcam-02/values.yaml b/services/bl47p-ea-dcam-02/values.yaml
@@ -1,4 +1,4 @@
 # latest container image for GigE cameras from the GitHub Container Registry
 shared:
   ioc-instance:
-    image: ghcr.io/epics-containers/ioc-adaravis-linux-runtime:2024.2.1
+    image: ghcr.io/epics-containers/ioc-adaravis-runtime:2024.4.2
diff --git a/services/bl47p-ea-panda-01/values.yaml b/services/bl47p-ea-panda-01/values.yaml
@@ -1,4 +1,4 @@
 shared:
   ioc-instance:
-    image: ghcr.io/pandablocks/pandablocks-ioc:0.3.2
+    image: ghcr.io/pandablocks/pandablocks-ioc:0.5.0
     iocConfig: /epics/ioc
diff --git a/services/bl47p-ea-test-01/values.yaml b/services/bl47p-ea-test-01/values.yaml
@@ -1,4 +1,4 @@
 # latest container image for GigE cameras from the GitHub Container Registry
 shared:
   ioc-instance:
-    image: ghcr.io/epics-containers/ioc-adsimdetector-linux-runtime:2024.2.1
+    image: ghcr.io/epics-containers/ioc-adsimdetector-runtime:2024.4.1
diff --git a/services/bl47p-mo-ioc-01/config/ioc.yaml b/services/bl47p-mo-ioc-01/config/ioc.yaml
@@ -1,4 +1,4 @@
-# yaml-language-server: $schema=https://github.com/epics-containers/ioc-pmac/releases/download/2024.1.2/ibek.ioc.schema.json
+# yaml-language-server: $schema=https://github.com/epics-containers/ioc-pmac/releases/download/2024.4.1/ibek.ioc.schema.json
 ioc_name: "{{ __utils__.get_env('IOC_NAME') }}"
 
 description: auto-generated by https://github.com/epics-containers/builder2ibek

diff --git a/services/bl47p-mo-ioc-01/values.yaml b/services/bl47p-mo-ioc-01/values.yaml
@@ -1,3 +1,3 @@
 shared:
   ioc-instance:
-    image: ghcr.io/epics-containers/ioc-pmac-linux-runtime:2024.2.1
+    image: ghcr.io/epics-containers/ioc-pmac-runtime:2024.4.1
diff --git a/services/epics-opis/Chart.yaml b/services/epics-opis/Chart.yaml
@@ -2,7 +2,7 @@
 apiVersion: v2
 name: epics-opis
 
-version: 2.0.0
+version: 3.4.0
 
 # When we deploy with the edge-containers-cli we override this on the command line.
 # Direct deployment with Helm will use the default beta value.
@@ -12,6 +12,6 @@ type: application
 
 dependencies:
   - name: epics-opis
-    version: "3.0.0"
+    version: "3.4.0"
     #repository: "file:///scratch/hgv27681/work/ec-helm-charts/Charts/epics-opis"
     repository: "oci://ghcr.io/epics-containers"
diff --git a/services/epics-opis/config/nginx.conf b/services/epics-opis/config/nginx.conf
@@ -0,0 +1,41 @@
+worker_processes  auto;
+
+# using tmp for logs due to capability DROPS on ioc namespaces
+# (UPDATE: are now using standard image, this is no longer necessary - probably)
+error_log  /tmp/error.log notice;
+pid        /tmp/nginx.pid;
+
+
+events {
+    # using a low number here as this server won't get much traffic
+    worker_connections  50;
+}
+
+
+http {
+    autoindex on;
+
+    include       /etc/nginx/mime.types;
+    default_type  application/octet-stream;
+
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log  /tmp/access.log  main;
+
+    sendfile        on;
+    #tcp_nopush     on;
+
+    keepalive_timeout  65;
+
+    #gzip  on;
+
+    include /etc/nginx/conf.d/*.conf;
+
+    server {
+        autoindex on;
+        add_header Access-Control-Allow-Origin '*';
+        add_header Access-Control-Allow-Methods 'GET';
+    }
+}
diff --git a/services/epics-opis/templates/configmap.yaml b/services/epics-opis/templates/configmap.yaml
@@ -0,0 +1,10 @@
+# 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 }}
+data:
+{{ (.Files.Glob "config/*").AsConfig | indent 2 }}
+---
diff --git a/services/epics-pvcs/Chart.yaml b/services/epics-pvcs/Chart.yaml
@@ -2,7 +2,7 @@
 apiVersion: v2
 name: epics-pvcs
 
-version: 3.0.0
+version: 3.4.0
 
 # When we deploy with the edge-containers-cli we override this on the command line.
 # Direct deployment with Helm will use the default beta value.
@@ -12,6 +12,6 @@ type: application
 
 dependencies:
   - name: epics-pvcs
-    version: "3.0.0"
+    version: "3.4.0"
     # repository: "file:///scratch/hgv27681/work/ec-helm-charts/Charts/epics-pvcs"
     repository: "oci://ghcr.io/epics-containers"