From befe13225c93698ae4a516122eccdbf6187ca4f5 Mon Sep 17 00:00:00 2001 From: Jonas Juselius Date: Fri, 17 Jan 2025 15:27:16 +0100 Subject: [PATCH] fix: new atlantis and sorcerer preprod --- values/atlantis/prod/appsettings.json | 17 ++++++++++++----- values/atlantis/staging/appsettings.json | 15 +++++++++++---- values/atlantis/staging/secrets.yaml | 16 +++++++--------- values/atlantis/values-prod.yaml | 2 +- values/atlantis/values-staging.yaml | 4 ++-- values/sorcerer/prod/appsettings.json | 2 +- values/sorcerer/staging/appsettings.json | 21 ++++++++++++++------- values/sorcerer/staging/secrets.yaml | 14 ++++++-------- values/sorcerer/values-staging.yaml | 2 +- 9 files changed, 55 insertions(+), 38 deletions(-) diff --git a/values/atlantis/prod/appsettings.json b/values/atlantis/prod/appsettings.json index f6a2b982..64381872 100644 --- a/values/atlantis/prod/appsettings.json +++ b/values/atlantis/prod/appsettings.json @@ -28,15 +28,22 @@ "signedOutRedirectUri": "https://maps.beta.oceanbox.io", "realm": "atlantis", "environment": "prod", - "keyStore": "azure", - "certStore": "https://atlantis.blob.core.windows.net", - "dataProtectionKeys": "https://atlantisvault.vault.azure.net/keys/dataprotection" + "keyStore": { + "kind": "azure", + "uri": "https://atlantis.blob.core.windows.net", + "key": "dataprotection-keys" + }, + "keyVault": { + "kind": "azure", + "uri": "https://atlantisvault.vault.azure.net", + "key": "dataencryption-keys" + } }, "fga": { "apiUrl": "http://prod-openfga.openfga.svc.cluster.local:8080", "apiKey": "", "storeId": "01JH65JAW80D06GYBN7A8TBZRG", - "modelId": "01JHAKPHR1YG5A33E4NGS00XK9" + "modelId": "" }, "plainAuthUsers": [ { @@ -57,7 +64,7 @@ "appName": "atlantis", "appEnv": "prod", "appNamespace": "atlantis", - "appVersion": "2.92.0", + "appVersion": "2.95.1", "otelCollector": "http://opentelemetry-collector.otel.svc:4317", "pubsubName": "pubsub", "pubsubTopic": "hipster-atlantis", diff --git a/values/atlantis/staging/appsettings.json b/values/atlantis/staging/appsettings.json index 48bf4bd4..9c24a453 100644 --- a/values/atlantis/staging/appsettings.json +++ b/values/atlantis/staging/appsettings.json @@ -28,14 +28,21 @@ "signedOutRedirectUri": "https://atlantis.beta.oceanbox.io", "realm": "atlantis", "environment": "staging", - "keyStore": "azure", - "certStore": "https://atlantis.blob.core.windows.net", - "dataProtectionKeys": "https://atlantisvault.vault.azure.net/keys/dataprotection" + "keyStore": { + "kind": "azure", + "uri": "https://atlantis.blob.core.windows.net", + "key": "dataprotection-keys" + }, + "keyVault": { + "kind": "azure", + "uri": "https://atlantisvault.vault.azure.net", + "key": "dataencryption-keys" + } }, "fga": { "apiUrl": "http://staging-openfga.openfga.svc.cluster.local:8080", "apiKey": "", - "storeId": "01J6C1NBX36E1B928HFSB123XQ", + "storeId": "01JH65JAW80D06GYBN7A8TBZRG", "modelId": "" }, "plainAuthUsers": [ diff --git a/values/atlantis/staging/secrets.yaml b/values/atlantis/staging/secrets.yaml index 38614900..c710c436 100644 --- a/values/atlantis/staging/secrets.yaml +++ b/values/atlantis/staging/secrets.yaml @@ -1,12 +1,10 @@ -# apiVersion: v1 -# kind: Secret -# metadata: -# annotations: -# kyverno/clone: "true" -# name: staging-atlantis-env -# type: Opaque -# data: -# --- +apiVersion: v1 +kind: Secret +metadata: + name: staging-atlantis-env +type: Opaque +data: +--- apiVersion: v1 kind: Secret metadata: diff --git a/values/atlantis/values-prod.yaml b/values/atlantis/values-prod.yaml index 0159170f..bdcd010a 100644 --- a/values/atlantis/values-prod.yaml +++ b/values/atlantis/values-prod.yaml @@ -1,7 +1,7 @@ replicaCount: 1 image: - tag: v2.94.0 + tag: v2.95.1 podAnnotations: dapr.io/app-id: "preprod-atlantis" diff --git a/values/atlantis/values-staging.yaml b/values/atlantis/values-staging.yaml index 60536d45..3e1a28a3 100644 --- a/values/atlantis/values-staging.yaml +++ b/values/atlantis/values-staging.yaml @@ -1,7 +1,7 @@ replicaCount: 1 image: - tag: e2257c92-debug + tag: b565feb3-debug podAnnotations: dapr.io/app-id: "staging-atlantis" @@ -10,7 +10,7 @@ env: - name: APP_NAMESPACE value: staging-atlantis - name: APP_VERSION - value: "2.92.0" + value: "2.95.1" - name: LOG_LEVEL value: "3" - name: REDIS_USER diff --git a/values/sorcerer/prod/appsettings.json b/values/sorcerer/prod/appsettings.json index c7426871..44c6815d 100644 --- a/values/sorcerer/prod/appsettings.json +++ b/values/sorcerer/prod/appsettings.json @@ -36,7 +36,7 @@ "apiUrl": "https://openfga.srv.oceanbox.io", "apiKey": "", "storeId": "01J6C1NBX36E1B928HFSB123XQ", - "modelId": "01JFA49B1JZF1MZ426HQTZ6WTJ" + "modelId": "01JHMSEB0WJGHGNAZ47NVW8Z3A" }, "redis": "localhost:6379,user=default,password=secret", "allowedOrigins": [ diff --git a/values/sorcerer/staging/appsettings.json b/values/sorcerer/staging/appsettings.json index 1e729f0c..ea6b9a94 100644 --- a/values/sorcerer/staging/appsettings.json +++ b/values/sorcerer/staging/appsettings.json @@ -7,7 +7,7 @@ "userinfo_endpoint": "https://auth.oceanbox.io/realms/oceanbox/protocol/openid-connect/userinfo", "end_session_endpoint": "https://auth.oceanbox.io/realms/oceanbox/protocol/openid-connect/logout", "device_authorization_endpoint": "https://auth.oceanbox.io/realms/oceanbox/protocol/openid-connect/auth/device", - "clientId": "sorcerer_dev", + "clientId": "sorcerer", "clientSecret": "", "scopes": [ "openid", @@ -24,13 +24,20 @@ }, "sso": { "cookieDomain": ".oceanbox.io", - "cookieName": ".obx.staging", + "cookieName": ".obx.prod", "signedOutRedirectUri": "https://maps.beta.oceanbox.io", "realm": "atlantis", - "environment": "staging", - "keyStore": "azure", - "certStore": "https://atlantis.blob.core.windows.net", - "dataProtectionKeys": "https://atlantisvault.vault.azure.net/keys/dataprotection" + "environment": "prod", + "keyStore": { + "kind": "azure", + "uri": "https://atlantis.blob.core.windows.net", + "key": "dataprotection-keys" + }, + "keyVault": { + "kind": "azure", + "uri": "https://atlantisvault.vault.azure.net", + "key": "dataencryption-keys" + } }, "plainAuthUsers": [], "fga": { @@ -56,7 +63,7 @@ "http://staging-sorcerer.ekman.oceanbox.io" ], "appName": "sorcerer", - "appEnv": "staging", + "appEnv": "prod", "appNamespace": "staging-sorcerer", "appVersion": "0.0.0", "otelCollector": "http://10.255.241.12:4317", diff --git a/values/sorcerer/staging/secrets.yaml b/values/sorcerer/staging/secrets.yaml index e0f9d01e..5e29d6c3 100644 --- a/values/sorcerer/staging/secrets.yaml +++ b/values/sorcerer/staging/secrets.yaml @@ -1,11 +1,9 @@ -# apiVersion: v1 -# kind: Secret -# metadata: -# annotations: -# kyverno/clone: "true" -# name: staging-sorcerer-env -# type: Opaque -# data: +apiVersion: v1 +kind: Secret +metadata: + name: staging-sorcerer-env +type: Opaque +data: --- apiVersion: v1 kind: Secret diff --git a/values/sorcerer/values-staging.yaml b/values/sorcerer/values-staging.yaml index 145843a8..c30a9928 100644 --- a/values/sorcerer/values-staging.yaml +++ b/values/sorcerer/values-staging.yaml @@ -1,7 +1,7 @@ replicaCount: 1 image: - tag: 7da363ca-debug + tag: v4.15.0 podAnnotations: dapr.io/enabled: "true"