From e7ed4ec08cc53c07c4a9d335b2e7afa7023fb1b0 Mon Sep 17 00:00:00 2001 From: Max Herbert Date: Wed, 6 Nov 2024 15:33:21 +0000 Subject: [PATCH] Working tetramm --- services/bl99p-cs-ioc-02/config/ioc.yaml | 9 -------- services/bl99p-ea-panda-01/config/start.sh | 1 - services/bl99p-ea-tetramm-01/Chart.yaml | 11 ++++++++++ services/bl99p-ea-tetramm-01/config/ioc.yaml | 19 +++++++++++++++++ .../templates/configmap.yaml | 10 +++++++++ services/bl99p-ea-tetramm-01/values.yaml | 21 +++++++++++++++++++ 6 files changed, 61 insertions(+), 10 deletions(-) create mode 100644 services/bl99p-ea-tetramm-01/Chart.yaml create mode 100644 services/bl99p-ea-tetramm-01/config/ioc.yaml create mode 100644 services/bl99p-ea-tetramm-01/templates/configmap.yaml create mode 100644 services/bl99p-ea-tetramm-01/values.yaml diff --git a/services/bl99p-cs-ioc-02/config/ioc.yaml b/services/bl99p-cs-ioc-02/config/ioc.yaml index 8a2c6b4..eb0b2ce 100644 --- a/services/bl99p-cs-ioc-02/config/ioc.yaml +++ b/services/bl99p-cs-ioc-02/config/ioc.yaml @@ -25,15 +25,6 @@ entities: IOC: BL99P-CS-IOC-02 name: IOC-STATS - - type: autosave.Autosave - bl: true - iocName: BL99P-CS-IOC-02 - path: /dls_sw/p99/epics/autosave - debug: 0 - skip_1: false - server: None - ip: None - name: "" - type: terminalServer.Moxa HOST: bl99p-nt-tserv-01 diff --git a/services/bl99p-ea-panda-01/config/start.sh b/services/bl99p-ea-panda-01/config/start.sh index f226631..c756f24 100755 --- a/services/bl99p-ea-panda-01/config/start.sh +++ b/services/bl99p-ea-panda-01/config/start.sh @@ -1,3 +1,2 @@ #!/bin/bash -sleep infinity pandablocks-ioc softioc 10.177.8.1 BL99P-MO-PANDA-01 --clear-bobfiles --screens-dir /epics/opi diff --git a/services/bl99p-ea-tetramm-01/Chart.yaml b/services/bl99p-ea-tetramm-01/Chart.yaml new file mode 100644 index 0000000..5732737 --- /dev/null +++ b/services/bl99p-ea-tetramm-01/Chart.yaml @@ -0,0 +1,11 @@ +# A Helm Chart for an IOC instance +apiVersion: v2 +name: ec-service +version: 1.0.0 + +type: application + +dependencies: + - name: ioc-instance + version: 4.0.0 + repository: "oci://ghcr.io/epics-containers" \ No newline at end of file diff --git a/services/bl99p-ea-tetramm-01/config/ioc.yaml b/services/bl99p-ea-tetramm-01/config/ioc.yaml new file mode 100644 index 0000000..1491d44 --- /dev/null +++ b/services/bl99p-ea-tetramm-01/config/ioc.yaml @@ -0,0 +1,19 @@ +# yaml-language-server: $schema=file:///tmp/schema.json + +ioc_name: "{{ _global.get_env('IOC_NAME') }}" + +description: Example TetrAMM for BL99P + +entities: + - type: quadEM.TetrAMM + PORT: XBPM1.DRV + P: BL99P-EA-XBPM-01 + R: ":DRV:" + QSIZE: 20 + IP: "172.23.177.144:10001" # TODO: replace with actual IP + + - type: quadEM.Plugins + DEVICE: XBPM1.DRV + PORTPREFIX: XBPM1 + STAT_NCHAN: 1000 + STAT_XSIZE: 10000 diff --git a/services/bl99p-ea-tetramm-01/templates/configmap.yaml b/services/bl99p-ea-tetramm-01/templates/configmap.yaml new file mode 100644 index 0000000..3b4c418 --- /dev/null +++ b/services/bl99p-ea-tetramm-01/templates/configmap.yaml @@ -0,0 +1,10 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ .Release.Name }}-config + labels: + app: {{ .Release.Name }} +data: + +# contents of the ioc instance config folder +{{ (.Files.Glob "config/*").AsConfig | indent 2 }} \ No newline at end of file diff --git a/services/bl99p-ea-tetramm-01/values.yaml b/services/bl99p-ea-tetramm-01/values.yaml new file mode 100644 index 0000000..5500f5b --- /dev/null +++ b/services/bl99p-ea-tetramm-01/values.yaml @@ -0,0 +1,21 @@ +# yaml-language-server: $schema=https://github.com/epics-containers/ec-helm-charts/releases/download/3.4.4/ioc-instance.schema.json#/$defs/service +ioc-instance: + image: ghcr.io/epics-containers/ioc-tetramm-developer:2024.11.2 + + # NOTE: the following are suggestions to help with debugging IOCs + # 1. replace the runtime container with the developer version + # this adds tools and compilers to the container so you + # can experiment in the cluster to fix the issue + # + # image: ghcr.io/epics-containers/ioc-adsimdetector-developer:2024.4.1 + + # 2. override the entry point to be a sleep infinity + # this means you can now use 'ec exec' to get a shell + # in the container and run /epics/ioc/start.sh. + # If it fails you can see the error and the pod + # will not terminate. In combination with 1. above you + # can experiment with changes until the issue + # is fixed. + # + # startCommand: sleep + # startArgs: infinity \ No newline at end of file