From 61403261cd571c502f11d6d91288c0c33e8a1a4e Mon Sep 17 00:00:00 2001 From: Jonas Juselius Date: Sat, 14 Dec 2024 08:59:30 +0100 Subject: [PATCH 1/6] fix: update atlantis --- values/atlantis/values-staging.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/values/atlantis/values-staging.yaml b/values/atlantis/values-staging.yaml index b011e99a..bf0969f1 100644 --- a/values/atlantis/values-staging.yaml +++ b/values/atlantis/values-staging.yaml @@ -1,7 +1,7 @@ replicaCount: 1 image: - tag: 6f500b02-debug + tag: 5979ed9f-debug podAnnotations: dapr.io/app-id: "staging-atlantis" From 8edbe0e0784eca299f73908daa520f4bc6542c86 Mon Sep 17 00:00:00 2001 From: Jonas Juselius Date: Sat, 14 Dec 2024 09:10:15 +0100 Subject: [PATCH 2/6] fix: dapr component scopes for sorcerer --- values/sorcerer/prod/configurations.yaml | 2 +- values/sorcerer/prod/statestore.yaml | 2 +- values/sorcerer/staging/configurations.yaml | 2 +- values/sorcerer/staging/statestore.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/values/sorcerer/prod/configurations.yaml b/values/sorcerer/prod/configurations.yaml index 429dbb33..9d8cfa31 100644 --- a/values/sorcerer/prod/configurations.yaml +++ b/values/sorcerer/prod/configurations.yaml @@ -17,4 +17,4 @@ spec: - name: redisDB value: "2" scopes: - - sorcerer + - prod-sorcerer diff --git a/values/sorcerer/prod/statestore.yaml b/values/sorcerer/prod/statestore.yaml index 2b4a5d4d..ff14eb45 100644 --- a/values/sorcerer/prod/statestore.yaml +++ b/values/sorcerer/prod/statestore.yaml @@ -19,4 +19,4 @@ spec: - name: redisDB value: "1" scopes: - - sorcerer + - prod-sorcerer diff --git a/values/sorcerer/staging/configurations.yaml b/values/sorcerer/staging/configurations.yaml index 6aff89ad..606b3ed3 100644 --- a/values/sorcerer/staging/configurations.yaml +++ b/values/sorcerer/staging/configurations.yaml @@ -17,4 +17,4 @@ spec: - name: redisDB value: "2" scopes: - - sorcerer + - staging-sorcerer diff --git a/values/sorcerer/staging/statestore.yaml b/values/sorcerer/staging/statestore.yaml index 116cb752..8ecd9391 100644 --- a/values/sorcerer/staging/statestore.yaml +++ b/values/sorcerer/staging/statestore.yaml @@ -19,4 +19,4 @@ spec: - name: redisDB value: "1" scopes: - - sorcerer + - staging-sorcerer From eba8f961f0b8a90a3dd77cdb2e83ebdd8b7904f0 Mon Sep 17 00:00:00 2001 From: Jonas Juselius Date: Sat, 14 Dec 2024 11:50:21 +0100 Subject: [PATCH 3/6] fix: update staging atlantis and sorcerer --- values/atlantis/values-staging.yaml | 2 +- values/sorcerer/staging/appsettings.json | 1 + values/sorcerer/values-staging.yaml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/values/atlantis/values-staging.yaml b/values/atlantis/values-staging.yaml index bf0969f1..65d8b866 100644 --- a/values/atlantis/values-staging.yaml +++ b/values/atlantis/values-staging.yaml @@ -1,7 +1,7 @@ replicaCount: 1 image: - tag: 5979ed9f-debug + tag: 5e79b6e-debug podAnnotations: dapr.io/app-id: "staging-atlantis" diff --git a/values/sorcerer/staging/appsettings.json b/values/sorcerer/staging/appsettings.json index c8fc1c90..e193abc1 100644 --- a/values/sorcerer/staging/appsettings.json +++ b/values/sorcerer/staging/appsettings.json @@ -37,6 +37,7 @@ "http://localhost:8085", "http://localhost:8080", "https://localhost:8080", + "https://sorcerer.ekman.oceanbox.io", "https://sorcerer.local.oceanbox.io:8080", "https://atlantis.local.oceanbox.io:8080", "https://atlantis.beta.oceanbox.io", diff --git a/values/sorcerer/values-staging.yaml b/values/sorcerer/values-staging.yaml index 70b7e983..25336f0f 100644 --- a/values/sorcerer/values-staging.yaml +++ b/values/sorcerer/values-staging.yaml @@ -1,7 +1,7 @@ replicaCount: 1 image: - tag: 004c06cd-debug + tag: bb5ae04-debug podAnnotations: dapr.io/app-id: "staging-sorcerer" From a0d937e40a27b37581e1dc06e19e682813947ab5 Mon Sep 17 00:00:00 2001 From: Jonas Juselius Date: Sat, 14 Dec 2024 12:02:20 +0100 Subject: [PATCH 4/6] fix: update staging atlantis and sorcerer --- values/atlantis/values-staging.yaml | 2 +- values/sorcerer/values-staging.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/values/atlantis/values-staging.yaml b/values/atlantis/values-staging.yaml index 65d8b866..b860f7f0 100644 --- a/values/atlantis/values-staging.yaml +++ b/values/atlantis/values-staging.yaml @@ -1,7 +1,7 @@ replicaCount: 1 image: - tag: 5e79b6e-debug + tag: 5e79b6e7-debug podAnnotations: dapr.io/app-id: "staging-atlantis" diff --git a/values/sorcerer/values-staging.yaml b/values/sorcerer/values-staging.yaml index 25336f0f..8c41572f 100644 --- a/values/sorcerer/values-staging.yaml +++ b/values/sorcerer/values-staging.yaml @@ -1,7 +1,7 @@ replicaCount: 1 image: - tag: bb5ae04-debug + tag: bb5ae041-debug podAnnotations: dapr.io/app-id: "staging-sorcerer" From d2e50f17765345157b96bfd247387e689f4d6529 Mon Sep 17 00:00:00 2001 From: Jonas Juselius Date: Sat, 14 Dec 2024 19:12:27 +0100 Subject: [PATCH 5/6] fix: use multi-audience tokens --- values/atlantis/prod/appsettings.json | 6 ++++++ values/atlantis/staging/appsettings.json | 6 ++++++ values/atlantis/values-staging.yaml | 2 +- values/sorcerer/prod/appsettings.json | 6 ++++++ values/sorcerer/staging/appsettings.json | 6 ++++++ values/sorcerer/values-staging.yaml | 2 +- 6 files changed, 26 insertions(+), 2 deletions(-) diff --git a/values/atlantis/prod/appsettings.json b/values/atlantis/prod/appsettings.json index 00427c8d..19fcb997 100644 --- a/values/atlantis/prod/appsettings.json +++ b/values/atlantis/prod/appsettings.json @@ -13,6 +13,12 @@ "email", "offline_access", "profile" + ], + "audiences": [ + "atlantis", + "atlantis_dev", + "sorcerer", + "sorcerer_dev" ] }, "sso": { diff --git a/values/atlantis/staging/appsettings.json b/values/atlantis/staging/appsettings.json index e7d63431..62799354 100644 --- a/values/atlantis/staging/appsettings.json +++ b/values/atlantis/staging/appsettings.json @@ -13,6 +13,12 @@ "email", "offline_access", "profile" + ], + "audiences": [ + "atlantis", + "atlantis_dev", + "sorcerer", + "sorcerer_dev" ] }, "sso": { diff --git a/values/atlantis/values-staging.yaml b/values/atlantis/values-staging.yaml index b860f7f0..11e2e96b 100644 --- a/values/atlantis/values-staging.yaml +++ b/values/atlantis/values-staging.yaml @@ -1,7 +1,7 @@ replicaCount: 1 image: - tag: 5e79b6e7-debug + tag: 0af435db-debug podAnnotations: dapr.io/app-id: "staging-atlantis" diff --git a/values/sorcerer/prod/appsettings.json b/values/sorcerer/prod/appsettings.json index 9e34a9dc..baad47de 100644 --- a/values/sorcerer/prod/appsettings.json +++ b/values/sorcerer/prod/appsettings.json @@ -13,6 +13,12 @@ "email", "offline_access", "profile" + ], + "audiences": [ + "atlantis", + "atlantis_dev", + "sorcerer", + "sorcerer_dev" ] }, "sso": { diff --git a/values/sorcerer/staging/appsettings.json b/values/sorcerer/staging/appsettings.json index e193abc1..d47da733 100644 --- a/values/sorcerer/staging/appsettings.json +++ b/values/sorcerer/staging/appsettings.json @@ -13,6 +13,12 @@ "email", "offline_access", "profile" + ], + "audiences": [ + "atlantis", + "atlantis_dev", + "sorcerer", + "sorcerer_dev" ] }, "sso": { diff --git a/values/sorcerer/values-staging.yaml b/values/sorcerer/values-staging.yaml index 8c41572f..bdbfeb02 100644 --- a/values/sorcerer/values-staging.yaml +++ b/values/sorcerer/values-staging.yaml @@ -1,7 +1,7 @@ replicaCount: 1 image: - tag: bb5ae041-debug + tag: 04dd76c6-debug podAnnotations: dapr.io/app-id: "staging-sorcerer" From 95fa446986650aa623b581a158046ebe7775b8d0 Mon Sep 17 00:00:00 2001 From: Jonas Juselius Date: Sat, 14 Dec 2024 20:35:01 +0100 Subject: [PATCH 6/6] fix: update sorcerer --- values/sorcerer/values-staging.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/values/sorcerer/values-staging.yaml b/values/sorcerer/values-staging.yaml index bdbfeb02..c28fb306 100644 --- a/values/sorcerer/values-staging.yaml +++ b/values/sorcerer/values-staging.yaml @@ -1,7 +1,7 @@ replicaCount: 1 image: - tag: 04dd76c6-debug + tag: ea2ca4db-debug podAnnotations: dapr.io/app-id: "staging-sorcerer"