Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/dashboard/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: dashboard
description: A dashboard for Diamond workflows
type: application
version: 0.2.10
version: 0.2.11
appVersion: 0.1.11
dependencies:
- name: common
Expand Down
7 changes: 4 additions & 3 deletions charts/dashboard/staging-values.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
configuration:
keycloakUrl: https://authn.diamond.ac.uk
keycloakRealm: master
keycloakClient: workflows-dashboard-staging
keycloakUrl: https://identity-dev.diamond.ac.uk
keycloakRealm: dls
keycloakClient: workflows-ui-dev
keycloakScope: "openid profile posix-uid email"
graphUrl: https://staging.workflows.diamond.ac.uk/graphql
graphWsUrl: wss://staging.workflows.diamond.ac.uk/graphql/ws
sourceDir: "/usr/share/nginx/html"
Expand Down
2 changes: 2 additions & 0 deletions charts/dashboard/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ spec:
value: {{ .Values.configuration.keycloakRealm }}
- name: KEYCLOAK_CLIENT
value: {{ .Values.configuration.keycloakClient }}
- name: KEYCLOAK_SCOPE
value: {{ .Values.configuration.keycloakScope }}
- name: GRAPH_URL
value: {{ .Values.configuration.graphUrl }}
- name: GRAPH_WS_URL
Expand Down
6 changes: 3 additions & 3 deletions charts/workflows-cluster/Chart.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ dependencies:
version: 0.27.0
- name: secrets
repository: file://./charts/secrets
version: 0.0.3
digest: sha256:ae868d10980562867d5d047808451ef241ed988f6166c1f11db12e2fc88f45bd
generated: "2026-01-14T13:30:29.267274419Z"
version: 0.0.4
digest: sha256:34c635039e08cc1bc5fa12001c88d0b7596dda404db587568154b2531ce0b466
generated: "2026-01-30T16:04:48.848347184Z"
4 changes: 2 additions & 2 deletions charts/workflows-cluster/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: workflows-cluster
description: A virtual cluster for Data Analysis workflows
type: application

version: 0.9.24
version: 0.9.25
dependencies:
- name: common
version: 2.23.0
Expand All @@ -13,5 +13,5 @@ dependencies:
version: 0.27.0
- name: secrets
repository: file://./charts/secrets
version: 0.0.3
version: 0.0.4
condition: secrets.enabled
2 changes: 1 addition & 1 deletion charts/workflows-cluster/charts/secrets/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: secrets
description: Sealed secrets for the workflows platform
type: application

version: 0.0.3
version: 0.0.4

dependencies:
- name: common
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ metadata:
namespace: workflows
spec:
encryptedData:
secret: AgB5elGRu/IrD/d1knub5wwJ3Ze31tqondUAptsDg9gSKJ8dO1uIYazS6IS3kX3E0MHTte6jeLCPKQfYu73+DxWHWSYjrJ3ABRR+kENvySG3T956lxBx51fzNgJVyk1VlzWeF7aMYSy3b4LuIDepankH6kmwFVTOyDBoXBOl5v3EoFc5/99F+6eOMrVj5EEGqnpMOqSi2o+sC4E55QRvKL0Icx7T5MqQCTPYPf12MOR8QyAufCl16RqdJpUj3Mhhtvj3ias8cCPoclpGzGm7Wx5T8cUQaz81R39Lorwni8xY6EeZM+g/jGYkBbj8YJWMeL/exGTayfGe7cx8N/UT70oQolNacvisIah0RqtRZbOd3rzO5ObTm80oa456TW9q6AsX1EI0LHQn7LAxXYkbu9qjF9rKkhezj35fs1GTluyUf76XYgI62/RZThMke5rGc4aJcoNFgFfxCTqcgLHFjrk8kb9oh3DO8O3QGLzZiXfH1t7uQAZq8yWeBDz1bTPZTniON0pYaUVm88kDjylxjgBdtqXun0e7icLIadc+L8znc73lL3Zn4J7KpuYnYfY1Etj3Pr7SFjrnAQ1WJ1Yennbg61gEIDCxFIh0epbT/wSqHlEuY1KIvZQHa7xNQh19JrYX4NFFJohOqymXQFqfSohv3nVgmkIZ0vCthv/NIbD7LXJeOnvl4k/MABtM9+xLCIkT/Rjt+04=
secret: AgCaf5x+5MNmis2Q6oGEFZdEmG86xz9ikbtDAsdv5gfml4Wsv+va8Vy92+jcNsRAqjfixmjiEKbHr4eESelHmbHdzefrRaP5MzlnCygilLiFd5pGDlzXQaHjnBW1ItfpG3fCWg1X95FhpmcFnYObBWlz8LhFqEc2W4l+E1xDn1MOcoAqnnOUSv3K0UIir6io0/K/tcS9LXL0q32UIkwLb/P6a8NiqkbaY8+Tgv+CXL0c00T3tLqUggCDty6SbyOTidIomSGlXBUmz0TTClAjUFqZc4coi2PSmLNkoRbxaTBJXrFa21SOTKIcqqfEK5YK0QTAwWV7qD/LUmJ2QC0v7nOCqPJLQXDb9YK08D8TXABCcoYCwUcQvilT28eiFx8okLflL6VktxBPqiH78U6HznvMcilFW3ELY/vCEcj3S3WpMkTvh9AE0fPYmKtAJKVXv0977dJ0OQ618uzhXyagqkD/U4XBEcw9cly4++P0qN0hntCDdvswgDj/hqEWqKIqwYFbPJ5PM9bxVPAFTpb0azB4Gr8N+/MhdrhHLLNuw+lvPMPT+FPHiJwPKmEtsTV5XsBFr6hk/ypswmoBc+MibBTOuPbY6L+YIWRbGZk14lq3UzZiBVhFgQme6WhpFu6HgWL71+UTLDUU+DcwCrTXOBfCNqUYhLgaxAGfH9uuF0OjzN6QouyLOupvoq/xoHd3mc9ItwJiGTxRWvjJ+h47m2R4tx0Yv0xCqfpght6QXe7LCA==
template:
metadata:
name: argo-server-sso
Expand Down
2 changes: 1 addition & 1 deletion charts/workflows-cluster/staging-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ ingress:
authenticationConfiguration:
jwt:
- issuer:
url: https://authn.diamond.ac.uk/realms/master
url: https://identity-dev.diamond.ac.uk/realms/dls
audiences:
- workflows-cluster-staging
- graph
Expand Down
2 changes: 1 addition & 1 deletion charts/workflows/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: workflows
description: Data Analysis workflow orchestration
type: application
version: 0.13.36
version: 0.13.37
dependencies:
- name: argo-workflows
repository: https://argoproj.github.io/argo-helm
Expand Down
2 changes: 1 addition & 1 deletion charts/workflows/staging-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ oauth2-proxy:
clientSecretFile: /etc/alpha/secret
id: authn
oidcConfig:
issuerURL: https://authn.diamond.ac.uk/realms/master
issuerURL: https://identity-dev.diamond.ac.uk/realms/dls
insecureAllowUnverifiedEmail: true
audienceClaims:
- aud
Expand Down
1 change: 1 addition & 0 deletions frontend/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
- VITE_KEYCLOAK_URL
- VITE_KEYCLOAK_REALM
- VITE_KEYCLOAK_CLIENT
- VITE_KEYCLOAK_SCOPE
- VITE_GRAPH_URL
- VITE_GRAPH_WS_URL
5. yarn dev in frontend/dashboard
Expand Down
1 change: 1 addition & 0 deletions frontend/configure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ replace_placeholder() {
replace_placeholder KEYCLOAK_URL
replace_placeholder KEYCLOAK_REALM
replace_placeholder KEYCLOAK_CLIENT
replace_placeholder KEYCLOAK_SCOPE
replace_placeholder GRAPH_URL
replace_placeholder GRAPH_WS_URL

Expand Down
1 change: 1 addition & 0 deletions frontend/dashboard/.env.production
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
VITE_KEYCLOAK_URL = "{{ KEYCLOAK_URL }}"
VITE_KEYCLOAK_REALM = "{{ KEYCLOAK_REALM }}"
VITE_KEYCLOAK_CLIENT = "{{ KEYCLOAK_CLIENT }}"
VITE_KEYCLOAK_SCOPE = "{{ KEYCLOAK_SCOPE }}"
VITE_GRAPH_URL = "{{ GRAPH_URL }}"
VITE_GRAPH_WS_URL = "{{ GRAPH_WS_URL }}"
2 changes: 2 additions & 0 deletions frontend/dashboard/src/RelayEnvironment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { createClient } from "graphql-ws";

const HTTP_ENDPOINT = import.meta.env.VITE_GRAPH_URL;
const WS_ENDPOINT = import.meta.env.VITE_GRAPH_WS_URL;
const KEYCLOAK_SCOPE = import.meta.env.VITE_KEYCLOAK_SCOPE;

const keycloak = await getKeycloak();

Expand All @@ -24,6 +25,7 @@ function ensureKeycloakInit(): Promise<boolean> {
kcinitPromise = keycloak
.init({
onLoad: "login-required",
scope: KEYCLOAK_SCOPE,
})
.catch((err: unknown) => {
console.error("Keycloak init failed", err);
Expand Down
1 change: 1 addition & 0 deletions frontend/dashboard/src/vite-env.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ interface ImportMetaEnv {
readonly VITE_KEYCLOAK_URL: string;
readonly VITE_KEYCLOAK_REALM: string;
readonly VITE_KEYCLOAK_CLIENT: string;
readonly VITE_KEYCLOAK_SCOPE: string;
readonly VITE_GRAPH_URL: string;
readonly VITE_GRAPH_WS_URL: string;
}
Expand Down