diff --git a/backend/auth-daemon/.devcontainer/devcontainer.json b/backend/auth-daemon/.devcontainer/devcontainer.json index 720464918..16b6de367 100644 --- a/backend/auth-daemon/.devcontainer/devcontainer.json +++ b/backend/auth-daemon/.devcontainer/devcontainer.json @@ -5,7 +5,7 @@ "dockerfile": "Dockerfile" }, "containerEnv": { - "AUTH_DOMAIN": "https://authn.diamond.ac.uk/realms/master", + "AUTH_DOMAIN": "https://identity.diamond.ac.uk/realms/dls", "CLIENT_ID": "workflows-cluster", "GRAPH_URL": "https://workflows.diamond.ac.uk/graphql" }, diff --git a/charts/workflows-cluster/Chart.yaml b/charts/workflows-cluster/Chart.yaml index 8b7e68bae..902d40df1 100644 --- a/charts/workflows-cluster/Chart.yaml +++ b/charts/workflows-cluster/Chart.yaml @@ -3,7 +3,7 @@ name: workflows-cluster description: A virtual cluster for Data Analysis workflows type: application -version: 0.13.20 +version: 0.13.21 dependencies: - name: common version: 2.23.0 diff --git a/charts/workflows-cluster/staging-values.yaml b/charts/workflows-cluster/staging-values.yaml index a279141ae..124b00de1 100644 --- a/charts/workflows-cluster/staging-values.yaml +++ b/charts/workflows-cluster/staging-values.yaml @@ -192,26 +192,3 @@ authenticationConfiguration: message: "username cannot use reserved system: prefix" - expression: "user.groups.all(group, !group.startsWith('system:'))" message: "groups cannot use reserved system: prefix" - - issuer: - url: https://authn.diamond.ac.uk/realms/master - audiences: - - workflows-cluster-staging - - graph - audienceMatchPolicy: MatchAny - claimMappings: - username: - claim: fedid - prefix: "oidc:" - groups: - claim: groups - prefix: "oidc:" - uid: - claim: fedid - extra: - - key: "workflows.diamond.ac.uk/posixuid" - valueExpression: "string(claims.posix_uid)" - userValidationRules: - - expression: "!user.username.startsWith('system:')" - message: "username cannot use reserved system: prefix" - - expression: "user.groups.all(group, !group.startsWith('system:'))" - message: "groups cannot use reserved system: prefix" diff --git a/charts/workflows-cluster/values.yaml b/charts/workflows-cluster/values.yaml index bf11cff0e..c09568836 100644 --- a/charts/workflows-cluster/values.yaml +++ b/charts/workflows-cluster/values.yaml @@ -229,26 +229,3 @@ authenticationConfiguration: message: "username cannot use reserved system: prefix" - expression: "user.groups.all(group, !group.startsWith('system:'))" message: "groups cannot use reserved system: prefix" - - issuer: - url: https://authn.diamond.ac.uk/realms/master - audiences: - - workflows-cluster - - graph - audienceMatchPolicy: MatchAny - claimMappings: - username: - claim: fedid - prefix: "oidc:" - groups: - claim: groups - prefix: "oidc:" - uid: - claim: fedid - extra: - - key: "workflows.diamond.ac.uk/posixuid" - valueExpression: "string(claims.posix_uid)" - userValidationRules: - - expression: "!user.username.startsWith('system:')" - message: "username cannot use reserved system: prefix" - - expression: "user.groups.all(group, !group.startsWith('system:'))" - message: "groups cannot use reserved system: prefix" diff --git a/frontend/relay-workflows-lib/mocks/mockKeycloak.ts b/frontend/relay-workflows-lib/mocks/mockKeycloak.ts index cddea891c..4579ddbac 100644 --- a/frontend/relay-workflows-lib/mocks/mockKeycloak.ts +++ b/frontend/relay-workflows-lib/mocks/mockKeycloak.ts @@ -10,7 +10,7 @@ export const mockJwtPayload = { email: "mock@diamond.ac.uk", exp: Number.MAX_SAFE_INTEGER, iat: Number.MIN_SAFE_INTEGER, - iss: "https://authn.diamond.ac.uk/realms/master", + iss: "https://identity.diamond.ac.uk/realms/dls", name: "Mo C. Kuser", };