From 0f3f8b7a38abe9c2ca4ef5f6e0e1040745cbbb6b Mon Sep 17 00:00:00 2001 From: Jonas Juselius Date: Thu, 19 Dec 2024 09:54:55 +0100 Subject: [PATCH] feat: enable dapr-api-token --- charts/atlantis/values.yaml | 2 -- values/atlantis/prod/appsettings.json | 2 +- values/atlantis/values-prod.yaml | 20 ++++++++++++++++++++ values/atlantis/values-staging.yaml | 20 ++++++++++++++++++++ values/atlantis/values.yaml | 1 + values/sorcerer/prod/appsettings.json | 2 +- values/sorcerer/values-prod.yaml | 17 ++++++++++++++++- values/sorcerer/values-staging.yaml | 16 +++++++++++++++- 8 files changed, 74 insertions(+), 6 deletions(-) diff --git a/charts/atlantis/values.yaml b/charts/atlantis/values.yaml index 26f3addc..ee2db0c7 100644 --- a/charts/atlantis/values.yaml +++ b/charts/atlantis/values.yaml @@ -80,8 +80,6 @@ ingress: - hosts: - atlantis.srv.oceanbox.io secretName: atlantis-tls - internal: - annotations: {} persistence: enabled: false diff --git a/values/atlantis/prod/appsettings.json b/values/atlantis/prod/appsettings.json index 00427c8d..30cb48a8 100644 --- a/values/atlantis/prod/appsettings.json +++ b/values/atlantis/prod/appsettings.json @@ -29,7 +29,7 @@ "apiUrl": "https://openfga.dev.oceanbox.io", "apiKey": "", "storeId": "01J6C1NBX36E1B928HFSB123XQ", - "modelId": "01JF0ERP5Y690CN58TGBFT3TRS" + "modelId": "01JFA49B1JZF1MZ426HQTZ6WTJ" }, "plainAuthUsers": [ { diff --git a/values/atlantis/values-prod.yaml b/values/atlantis/values-prod.yaml index 787e4e42..31fccaf4 100644 --- a/values/atlantis/values-prod.yaml +++ b/values/atlantis/values-prod.yaml @@ -42,16 +42,36 @@ ingress: paths: - path: / pathType: ImplementationSpecific + - path: /events + pathType: ImplementationSpecific + serviceName: main-ingress-nginx-defaultbackend.ingress-nginx + servicePort: 80 internal: - path: /internal pathType: ImplementationSpecific + - path: /dapr + pathType: ImplementationSpecific + - path: /actors + pathType: ImplementationSpecific + - path: /job + pathType: ImplementationSpecific - host: maps.oceanbox.io paths: - path: / pathType: ImplementationSpecific + - path: /events + pathType: ImplementationSpecific + serviceName: main-ingress-nginx-defaultbackend.ingress-nginx + servicePort: 80 internal: - path: /internal pathType: ImplementationSpecific + - path: /dapr + pathType: ImplementationSpecific + - path: /actors + pathType: ImplementationSpecific + - path: /job + pathType: ImplementationSpecific tls: - hosts: - atlantis.srv.oceanbox.io diff --git a/values/atlantis/values-staging.yaml b/values/atlantis/values-staging.yaml index b011e99a..1c9b60a8 100644 --- a/values/atlantis/values-staging.yaml +++ b/values/atlantis/values-staging.yaml @@ -50,16 +50,36 @@ ingress: paths: - path: / pathType: ImplementationSpecific + - path: /events + pathType: ImplementationSpecific + serviceName: main-ingress-nginx-defaultbackend.ingress-nginx + servicePort: 80 internal: - path: /internal pathType: ImplementationSpecific + - path: /dapr + pathType: ImplementationSpecific + - path: /actors + pathType: ImplementationSpecific + - path: /job + pathType: ImplementationSpecific - host: atlas.oceanbox.io paths: - path: / pathType: ImplementationSpecific + - path: /events + pathType: ImplementationSpecific + serviceName: main-ingress-nginx-defaultbackend.ingress-nginx + servicePort: 80 internal: - path: /internal pathType: ImplementationSpecific + - path: /dapr + pathType: ImplementationSpecific + - path: /actors + pathType: ImplementationSpecific + - path: /job + pathType: ImplementationSpecific tls: - hosts: - atlantis.beta.oceanbox.io diff --git a/values/atlantis/values.yaml b/values/atlantis/values.yaml index d6321004..d13d6170 100644 --- a/values/atlantis/values.yaml +++ b/values/atlantis/values.yaml @@ -2,6 +2,7 @@ podAnnotations: dapr.io/enabled: "true" dapr.io/app-port: "8085" + dapr.io/api-token-secret: "dapr-api-token" dapr.io/config: "tracing" dapr.io/app-protocol: "http" dapr.io/log-as-json: "true" diff --git a/values/sorcerer/prod/appsettings.json b/values/sorcerer/prod/appsettings.json index 9e34a9dc..ce5903c4 100644 --- a/values/sorcerer/prod/appsettings.json +++ b/values/sorcerer/prod/appsettings.json @@ -30,7 +30,7 @@ "apiUrl": "https://openfga.srv.oceanbox.io", "apiKey": "", "storeId": "01J6C1NBX36E1B928HFSB123XQ", - "modelId": "01JF0ERP5Y690CN58TGBFT3TRS" + "modelId": "01JFA49B1JZF1MZ426HQTZ6WTJ" }, "redis": "localhost:6379,user=default,password=secret", "allowedOrigins": [ diff --git a/values/sorcerer/values-prod.yaml b/values/sorcerer/values-prod.yaml index 33ef8a20..91eda962 100644 --- a/values/sorcerer/values-prod.yaml +++ b/values/sorcerer/values-prod.yaml @@ -4,9 +4,10 @@ image: tag: latest podAnnotations: - dapr.io/app-id: "prod-sorcerer" dapr.io/enabled: "true" + dapr.io/app-id: "prod-sorcerer" dapr.io/app-port: "8085" + dapr.io/api-token-secret: "dapr-api-token" dapr.io/config: "tracing" dapr.io/app-protocol: "http" dapr.io/log-as-json: "true" @@ -39,9 +40,23 @@ ingress: atlantis.oceanbox.io/expose: internal hosts: - host: sorcerer.data.oceanbox.io + paths: paths: - path: / pathType: ImplementationSpecific + - path: /events + pathType: ImplementationSpecific + serviceName: main-ingress-nginx-defaultbackend.ingress-nginx + servicePort: 80 + internal: + - path: /internal + pathType: ImplementationSpecific + - path: /dapr + pathType: ImplementationSpecific + - path: /actors + pathType: ImplementationSpecific + - path: /job + pathType: ImplementationSpecific tls: - hosts: - sorcerer.data.oceanbox.io diff --git a/values/sorcerer/values-staging.yaml b/values/sorcerer/values-staging.yaml index 70b7e983..ad5a4787 100644 --- a/values/sorcerer/values-staging.yaml +++ b/values/sorcerer/values-staging.yaml @@ -4,9 +4,10 @@ image: tag: 004c06cd-debug podAnnotations: - dapr.io/app-id: "staging-sorcerer" dapr.io/enabled: "true" + dapr.io/app-id: "staging-sorcerer" dapr.io/app-port: "8085" + dapr.io/api-token-secret: "dapr-api-token" dapr.io/config: "tracing" dapr.io/app-protocol: "http" dapr.io/log-as-json: "true" @@ -43,6 +44,19 @@ ingress: paths: - path: / pathType: ImplementationSpecific + - path: /events + pathType: ImplementationSpecific + serviceName: main-ingress-nginx-defaultbackend.ingress-nginx + servicePort: 80 + internal: + - path: /internal + pathType: ImplementationSpecific + - path: /dapr + pathType: ImplementationSpecific + - path: /actors + pathType: ImplementationSpecific + - path: /job + pathType: ImplementationSpecific tls: - hosts: - sorcerer.ekman.oceanbox.io