fix: new atlantis and sorcerer preprod

This commit is contained in:
2025-01-17 15:27:16 +01:00
parent bc71b78da6
commit befe13225c
9 changed files with 55 additions and 38 deletions
+12 -5
View File
@@ -28,15 +28,22 @@
"signedOutRedirectUri": "https://maps.beta.oceanbox.io", "signedOutRedirectUri": "https://maps.beta.oceanbox.io",
"realm": "atlantis", "realm": "atlantis",
"environment": "prod", "environment": "prod",
"keyStore": "azure", "keyStore": {
"certStore": "https://atlantis.blob.core.windows.net", "kind": "azure",
"dataProtectionKeys": "https://atlantisvault.vault.azure.net/keys/dataprotection" "uri": "https://atlantis.blob.core.windows.net",
"key": "dataprotection-keys"
},
"keyVault": {
"kind": "azure",
"uri": "https://atlantisvault.vault.azure.net",
"key": "dataencryption-keys"
}
}, },
"fga": { "fga": {
"apiUrl": "http://prod-openfga.openfga.svc.cluster.local:8080", "apiUrl": "http://prod-openfga.openfga.svc.cluster.local:8080",
"apiKey": "", "apiKey": "",
"storeId": "01JH65JAW80D06GYBN7A8TBZRG", "storeId": "01JH65JAW80D06GYBN7A8TBZRG",
"modelId": "01JHAKPHR1YG5A33E4NGS00XK9" "modelId": ""
}, },
"plainAuthUsers": [ "plainAuthUsers": [
{ {
@@ -57,7 +64,7 @@
"appName": "atlantis", "appName": "atlantis",
"appEnv": "prod", "appEnv": "prod",
"appNamespace": "atlantis", "appNamespace": "atlantis",
"appVersion": "2.92.0", "appVersion": "2.95.1",
"otelCollector": "http://opentelemetry-collector.otel.svc:4317", "otelCollector": "http://opentelemetry-collector.otel.svc:4317",
"pubsubName": "pubsub", "pubsubName": "pubsub",
"pubsubTopic": "hipster-atlantis", "pubsubTopic": "hipster-atlantis",
+11 -4
View File
@@ -28,14 +28,21 @@
"signedOutRedirectUri": "https://atlantis.beta.oceanbox.io", "signedOutRedirectUri": "https://atlantis.beta.oceanbox.io",
"realm": "atlantis", "realm": "atlantis",
"environment": "staging", "environment": "staging",
"keyStore": "azure", "keyStore": {
"certStore": "https://atlantis.blob.core.windows.net", "kind": "azure",
"dataProtectionKeys": "https://atlantisvault.vault.azure.net/keys/dataprotection" "uri": "https://atlantis.blob.core.windows.net",
"key": "dataprotection-keys"
},
"keyVault": {
"kind": "azure",
"uri": "https://atlantisvault.vault.azure.net",
"key": "dataencryption-keys"
}
}, },
"fga": { "fga": {
"apiUrl": "http://staging-openfga.openfga.svc.cluster.local:8080", "apiUrl": "http://staging-openfga.openfga.svc.cluster.local:8080",
"apiKey": "", "apiKey": "",
"storeId": "01J6C1NBX36E1B928HFSB123XQ", "storeId": "01JH65JAW80D06GYBN7A8TBZRG",
"modelId": "" "modelId": ""
}, },
"plainAuthUsers": [ "plainAuthUsers": [
+7 -9
View File
@@ -1,12 +1,10 @@
# apiVersion: v1 apiVersion: v1
# kind: Secret kind: Secret
# metadata: metadata:
# annotations: name: staging-atlantis-env
# kyverno/clone: "true" type: Opaque
# name: staging-atlantis-env data:
# type: Opaque ---
# data:
# ---
apiVersion: v1 apiVersion: v1
kind: Secret kind: Secret
metadata: metadata:
+1 -1
View File
@@ -1,7 +1,7 @@
replicaCount: 1 replicaCount: 1
image: image:
tag: v2.94.0 tag: v2.95.1
podAnnotations: podAnnotations:
dapr.io/app-id: "preprod-atlantis" dapr.io/app-id: "preprod-atlantis"
+2 -2
View File
@@ -1,7 +1,7 @@
replicaCount: 1 replicaCount: 1
image: image:
tag: e2257c92-debug tag: b565feb3-debug
podAnnotations: podAnnotations:
dapr.io/app-id: "staging-atlantis" dapr.io/app-id: "staging-atlantis"
@@ -10,7 +10,7 @@ env:
- name: APP_NAMESPACE - name: APP_NAMESPACE
value: staging-atlantis value: staging-atlantis
- name: APP_VERSION - name: APP_VERSION
value: "2.92.0" value: "2.95.1"
- name: LOG_LEVEL - name: LOG_LEVEL
value: "3" value: "3"
- name: REDIS_USER - name: REDIS_USER
+1 -1
View File
@@ -36,7 +36,7 @@
"apiUrl": "https://openfga.srv.oceanbox.io", "apiUrl": "https://openfga.srv.oceanbox.io",
"apiKey": "", "apiKey": "",
"storeId": "01J6C1NBX36E1B928HFSB123XQ", "storeId": "01J6C1NBX36E1B928HFSB123XQ",
"modelId": "01JFA49B1JZF1MZ426HQTZ6WTJ" "modelId": "01JHMSEB0WJGHGNAZ47NVW8Z3A"
}, },
"redis": "localhost:6379,user=default,password=secret", "redis": "localhost:6379,user=default,password=secret",
"allowedOrigins": [ "allowedOrigins": [
+14 -7
View File
@@ -7,7 +7,7 @@
"userinfo_endpoint": "https://auth.oceanbox.io/realms/oceanbox/protocol/openid-connect/userinfo", "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", "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", "device_authorization_endpoint": "https://auth.oceanbox.io/realms/oceanbox/protocol/openid-connect/auth/device",
"clientId": "sorcerer_dev", "clientId": "sorcerer",
"clientSecret": "", "clientSecret": "",
"scopes": [ "scopes": [
"openid", "openid",
@@ -24,13 +24,20 @@
}, },
"sso": { "sso": {
"cookieDomain": ".oceanbox.io", "cookieDomain": ".oceanbox.io",
"cookieName": ".obx.staging", "cookieName": ".obx.prod",
"signedOutRedirectUri": "https://maps.beta.oceanbox.io", "signedOutRedirectUri": "https://maps.beta.oceanbox.io",
"realm": "atlantis", "realm": "atlantis",
"environment": "staging", "environment": "prod",
"keyStore": "azure", "keyStore": {
"certStore": "https://atlantis.blob.core.windows.net", "kind": "azure",
"dataProtectionKeys": "https://atlantisvault.vault.azure.net/keys/dataprotection" "uri": "https://atlantis.blob.core.windows.net",
"key": "dataprotection-keys"
},
"keyVault": {
"kind": "azure",
"uri": "https://atlantisvault.vault.azure.net",
"key": "dataencryption-keys"
}
}, },
"plainAuthUsers": [], "plainAuthUsers": [],
"fga": { "fga": {
@@ -56,7 +63,7 @@
"http://staging-sorcerer.ekman.oceanbox.io" "http://staging-sorcerer.ekman.oceanbox.io"
], ],
"appName": "sorcerer", "appName": "sorcerer",
"appEnv": "staging", "appEnv": "prod",
"appNamespace": "staging-sorcerer", "appNamespace": "staging-sorcerer",
"appVersion": "0.0.0", "appVersion": "0.0.0",
"otelCollector": "http://10.255.241.12:4317", "otelCollector": "http://10.255.241.12:4317",
+6 -8
View File
@@ -1,11 +1,9 @@
# apiVersion: v1 apiVersion: v1
# kind: Secret kind: Secret
# metadata: metadata:
# annotations: name: staging-sorcerer-env
# kyverno/clone: "true" type: Opaque
# name: staging-sorcerer-env data:
# type: Opaque
# data:
--- ---
apiVersion: v1 apiVersion: v1
kind: Secret kind: Secret
+1 -1
View File
@@ -1,7 +1,7 @@
replicaCount: 1 replicaCount: 1
image: image:
tag: 7da363ca-debug tag: v4.15.0
podAnnotations: podAnnotations:
dapr.io/enabled: "true" dapr.io/enabled: "true"