Merge pull request #18 from epics-containers/test-additions

Test p47 deployment with tracing and authentication

services/daq-blueapi/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: daq-blueapi
 description: blueapi
 
-version: 0.6.1-a7
+version: 0.6.2-a1
 
 # 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,5 +12,5 @@ type: application
 
 dependencies:
   - name: blueapi
-    version: "0.6.1-a7"
+    version: "0.6.2-a1"
     repository: "oci://ghcr.io/diamondlightsource/charts"

services/daq-blueapi/values.yaml

@@ -29,13 +29,11 @@ blueapi:
         secretKeyRef:
           name: rabbitmq-password
           key: rabbitmq-password
-    - name: OTEL_EXPORTER_OTLP_TRACES_PROTOCOL
-      value: http/protobuf
-    - name: OTEL_EXPORTER_OTLP_ENDPOINT
-      value: https://jaeger-all-in-one:4318
   tracing:
     otlp:
-      host: https://jaeger-all-in-one # replace with central instance
+      enabled: true
+      server:
+        host: https://jaeger-all-in-one # replace with central instance
   worker:
     env:
       sources:
@@ -51,6 +49,10 @@ blueapi:
         username: p47
         password: ${RABBITMQ_PASSWORD}
       host: daq-rabbitmq
+    oidc:
+      well_known_url: https://authn.diamond.ac.uk/realms/master/.well-known/openid-configuration
+      client_id: blueapi-cli
+      client_audience: [blueapi, p47]
     scratch:
       root: /exports/mybeamline/p47/scratch/blueapi
   initContainer: