Skip to content

Commit

Permalink
added blueapi nexus rabbitmq
Browse files Browse the repository at this point in the history
  • Loading branch information
ZohebShaikh committed Oct 9, 2024
1 parent b4a1f88 commit 09861dc
Show file tree
Hide file tree
Showing 9 changed files with 232 additions and 0 deletions.
16 changes: 16 additions & 0 deletions services/daq-blueapi/Chart.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
apiVersion: v2
name: daq-blueapi
description: blueapi

version: 0.4.5-a3

# 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.
appVersion: 0.0.1b1

type: application

dependencies:
- name: blueapi
version: "0.4.5-a3"
repository: "oci://ghcr.io/diamondlightsource/charts"
14 changes: 14 additions & 0 deletions services/daq-blueapi/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
daq-blueapi Helm Chart
=====================

Installs a blueapi instance.

Deploy this chart to the cluster by setting up your cluster namespace connection
using environment.sh and then executing the following commands:

```bash
# lists the latest versions of all services
ec list
# deploy daq-blueapi with specified version
ec deploy daq-blueapi VERSION
```
54 changes: 54 additions & 0 deletions services/daq-blueapi/values.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
blueapi:
hostNetwork: true
resources:
limits:
cpu: 1000m
memory: 500Mi
requests:
cpu: 500m
memory: 100Mi
nodeSelector:
kubernetes.io/hostname: p46-control.diamond.ac.uk
tolerations:
- key: nodetype
operator: Equal
value: test-rig
effect: NoSchedule
- key: beamline
operator: Equal
value: p46-beamline
effect: NoSchedule
ingress:
create: true
host: p46-blueapi.diamond.ac.uk
extraEnvVars:
- name: RABBITMQ_PASSWORD
valueFrom:
secretKeyRef:
name: rabbitmq-password
key: rabbitmq-password
worker:
env:
sources:
- kind: dodal
module: dodal.beamlines.p46
- kind: planFunctions
module: i22_bluesky.plans
# TODO: Make p46 plans repository
- kind: planFunctions
module: dls_bluesky_core.plans
- kind: planFunctions
module: dls_bluesky_core.stubs
events:
broadcast_status_events: False
stomp:
auth:
username: p46
passcode: ${RABBITMQ_PASSWORD}
host: daq-rabbitmq
scratch:
root: /dls_sw/p46/software/blueapi/scratch
repositories:
- name: dodal
remote_url: https://github.com/DiamondLightSource/dodal.git
scratchHostPath: /dls_sw/p46/software/blueapi/scratch
16 changes: 16 additions & 0 deletions services/daq-nexus/Chart.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
apiVersion: v2
name: daq-nexus
description: nexus

version: 3.5.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.
appVersion: 0.0.1b1

type: application

dependencies:
- name: nexus-file-converter
version: "3.5.0"
repository: "https://sonatypenexus.diamond.ac.uk/repository/daq-helm/"
59 changes: 59 additions & 0 deletions services/daq-nexus/values.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
nexus-file-converter:
beamline: p46
template:
entry/:
NX_class@: NXentry
instrument/:
NX_class@: NXinstrument
name: p46

volumes:
- name: nexus-template
configMap:
name: nexus-template
items:
- key: template.yaml
path: template.yaml
- name: nexus-data
hostPath:
path: /dls/p46/data
type: DirectoryOrCreate

volumeMounts:
- name: nexus-data
mountPath: /dls/p46/data
mountPropagation: HostToContainer
- name: nexus-template
mountPath: /templates

application:
server:
port: 8084
spring:
profiles:
active: rabbitmq
rabbitmq:
host: daq-rabbitmq
username: p46
files:
output:
directory:
staticDirectory: /dls/p46/data/2024/cm37283-2/
nameTemplate: <DATA_SESSION>
devices:
types:
det: NX_DETECTOR
diff: NX_DETECTOR
panda1: NX_COLLECTION
panda2: NX_COLLECTION
chopper: NX_COLLECTION
sample_stage: NX_COLLECTION
containerEnvVars:
- name: SPRING_RABBITMQ_PASSWORD
valueFrom:
secretKeyRef:
name: rabbitmq-password
key: rabbitmq-password
securityContext:
runAsUser: 37890 # p46-detector
runAsGroup: 37890
16 changes: 16 additions & 0 deletions services/daq-rabbitmq/Chart.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
apiVersion: v2
name: daq-rabbitmq
description: RabbitMQ instance for DAQ services

version: 11.16.2

# 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.
appVersion: 0.0.1b1

type: application

dependencies:
- name: rabbitmq
version: 11.16.2
repository: oci://registry-1.docker.io/bitnamicharts
14 changes: 14 additions & 0 deletions services/daq-rabbitmq/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
daq-rabbitmq Helm Chart
=====================

Installs a RabbitMQ instance for use a message bus.

Deploy this chart to the cluster by setting up your cluster namespace connection
using environment.sh and then executing the following commands:

```bash
# lists the latest versions of all services
ec list
# deploy daq-rabbitmq with specified version
ec deploy daq-rabbitmq VERSION
```
16 changes: 16 additions & 0 deletions services/daq-rabbitmq/templates/rabbitmq.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
apiVersion: bitnami.com/v1alpha1
kind: SealedSecret
metadata:
creationTimestamp: null
name: rabbitmq-password
namespace: p46-beamline
spec:
encryptedData:
rabbitmq-password: AgDPDY4OTExVgPb2pDdO4YEZPTR+BN4IMvSDET1QFqRkfJ7r8OW9GdfSOJrmJ5/MOGL5u4kNIeVrhvzXJAvk8osWNXpvbA1B32psXRE/Fdlt5C95k8A1TBgGikh85o4BDv08rOGKIg3/LyYwWx9oGNDSsa0qEp4dato95UhS+JIhiKcvvHDf5CxRN3mUrzggALEM8x0b3qmkDbeSp15k2l0bn/BNBcjRe1aZhEBxd3mEmaKkX+y2T+BKiYCQ/k+IplZ+HLbJZlwtxqVZS85IfGeHsWAgMztmMbWMBH4vd/8qwaz1f79MWQ+W9p1ENy0er7XmFj2NRSa40BTAO8lpx3KAYR0Wr/TcEFhpcyTVSHPVvWSC83eyFOuoFaT6twil1OMMTpfpjK9zrsx3KytNaOkzgsLhmChefYpmRPNZL0b0jrHCIu+OaLpYdsULRYYWbZVEodSoj2IDrZ78U1h35nZYzDM6vf5J6953ZHC6NDkCCzZ+TaR+yZ0FgA5V+HBxFaBWBWFdZwYa0PysWpu5Kajn6LIInII4SAbGMGQ69nWpfH46qbShCgTzGn4xdrlUYYJ4Z8QnknEW4q/LWDgaDEwng1blyZZqp1npK/wycmDzyRWE26S5VHJDiCX+rM5y9J4JfJvCi0K93SUMD3hM50fOpXgRjo7D4RrK8kbnYWTcB1tAfPcE4K1APfguLoB/J80PHe0=
template:
data: null
metadata:
creationTimestamp: null
name: rabbitmq-password
namespace: p46-beamline

27 changes: 27 additions & 0 deletions services/daq-rabbitmq/values.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
rabbitmq:
auth:
username: p46
existingPasswordSecret: rabbitmq-password
extraPlugins: rabbitmq_jms_topic_exchange,rabbitmq_stomp
persistence:
enabled: false
rbac:
create: false
serviceAccount:
create: false
name: default-full-access-mounted # TODO: use only required permissions
extraContainerPorts:
- name: stomp
containerPort: 61613
service:
type: ClusterIP
extraPorts:
- name: stomp
port: 61613
targetPort: stomp
metrics: # TODO: Enable monitoring stack in namespace
enabled: true
podAnnotations:
prometheus.io/scrape: "true"
prometheus.io/path: /metrics
prometheus.io/port: "8080"

0 comments on commit 09861dc

Please sign in to comment.