Skip to content

Commit

Permalink
update andor2 to latest dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
gilesknap committed Nov 14, 2024
1 parent c670f0f commit 906ef54
Show file tree
Hide file tree
Showing 3 changed files with 64 additions and 6 deletions.
50 changes: 50 additions & 0 deletions services/bl99p-ea-ioc-01/debug.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
apiVersion: v1
kind: Pod
metadata:
name: debug-andor2
labels:
is_ioc: "true"
spec:
serviceAccountName: default-full-access-mounted
containers:
- name: debug-andor2
image: gcr.io/diamond-privreg/controls/prod/iocs/ioc-adandor-linux-developer:2024.10.2
command:
- bash
args:
- "-c"
- |
echo "keep running indefinetely"
while true; do sleep 5; done
resources:
limits:
memory: "2Gi"
cpu: "1"
diamond.ac.uk/andor2usb: 1
requests:
memory: "1Gi"
cpu: "500m"
diamond.ac.uk/andor2usb: 1

# securityContext:
# privileged: true
# allowPrivilegeEscalation: true

volumeMounts:
- mountPath: /dev/bus/usb/
name: devices

volumes:
- name: devices
persistentVolumeClaim:
claimName: dev-usb

affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: kubernetes.io/hostname
operator: In
values:
- bl99p-ea-serv-01.diamond.ac.uk
4 changes: 2 additions & 2 deletions services/bl99p-ea-ioc-05/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ type: application

dependencies:
- name: ioc-instance
version: 4.0.0
repository: "oci://ghcr.io/epics-containers"
version: 4.1.2
repository: "oci://ghcr.io/epics-containers"
16 changes: 12 additions & 4 deletions services/bl99p-ea-ioc-05/values.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# yaml-language-server: $schema=https://github.com/epics-containers/ec-helm-charts/releases/download/3.4.4/ioc-instance.schema.json#/$defs/service
# yaml-language-server: $schema=https://github.com/epics-containers/ec-helm-charts/releases/download/4.1.2/ioc-instance.schema.json#/$defs/service
ioc-instance:
image: gcr.io/diamond-privreg/controls/prod/iocs/ioc-adandor-linux-runtime:2024.10.2
image: gcr.io/diamond-privreg/controls/prod/iocs/ioc-adandor-linux-runtime:2024.10.2

dataVolume:
pvc: false
Expand All @@ -10,12 +10,20 @@ ioc-instance:
limits:
cpu: 2
memory: 512Mi
diamond.ac.uk/andor2usb: 1
requests:
cpu: 500m
memory: 128Mi
diamond.ac.uk/andor2usb: 1

volumes:
- name: usb-devices
persistentVolumeClaim:
claimName: dev-usb

volumeMounts:
- mountPath: /dev/bus/usb/
name: usb-devices

# 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
Expand All @@ -32,4 +40,4 @@ ioc-instance:
# is fixed.
#
# startCommand: sleep
# startArgs: infinity
# startArgs: infinity

0 comments on commit 906ef54

Please sign in to comment.