From 6bfc37c72321a8025131fbcc621d6edb6040b0f7 Mon Sep 17 00:00:00 2001 From: Jonas Juselius Date: Sun, 10 Mar 2024 13:31:38 +0100 Subject: [PATCH] major: flipping everything over to new k9s cluster! --- charts/archmeister/prod/appsettings.json | 2 +- charts/archmeister/staging/appsettings.json | 2 +- charts/atlantis/prod/appsettings.json | 2 +- charts/atlantis/staging/appsettings.json | 2 +- charts/atlantis/values-prod.yaml | 4 ++-- charts/dex/values-prod.yaml | 5 +++++ charts/keycloak/values.yaml | 3 ++- charts/petimeter/prod/appsettings.json | 2 +- charts/petimeter/staging/appsettings.json | 2 +- charts/seq/values.yaml | 6 +++--- charts/sorcerer/prod/appsettings.json | 2 +- charts/sorcerer/staging/appsettings.json | 2 +- 12 files changed, 20 insertions(+), 14 deletions(-) diff --git a/charts/archmeister/prod/appsettings.json b/charts/archmeister/prod/appsettings.json index 810b9de7..512211bf 100644 --- a/charts/archmeister/prod/appsettings.json +++ b/charts/archmeister/prod/appsettings.json @@ -40,7 +40,7 @@ "https://stig-atlantis.beta.oceanbox.io", "https://a.local.oceanbox.io:8080" ], - "logService" : "https://seq.oceanbox.io", + "logService" : "https://seq.adm.oceanbox.io", "logApiKey": "", "cliUsers": [ "admin:en-to-tre-fire" diff --git a/charts/archmeister/staging/appsettings.json b/charts/archmeister/staging/appsettings.json index 5a7867fe..f44a429a 100644 --- a/charts/archmeister/staging/appsettings.json +++ b/charts/archmeister/staging/appsettings.json @@ -35,7 +35,7 @@ "https://stig-atlantis.beta.oceanbox.io", "https://atlantis.local.oceanbox.io:8080" ], - "logService" : "https://seq.oceanbox.io", + "logService" : "https://seq.adm.oceanbox.io", "logApiKey": "", "cliUsers": [ "admin:en-to-tre-fire" diff --git a/charts/atlantis/prod/appsettings.json b/charts/atlantis/prod/appsettings.json index 6c60c5f3..6849be37 100644 --- a/charts/atlantis/prod/appsettings.json +++ b/charts/atlantis/prod/appsettings.json @@ -30,7 +30,7 @@ "http://atlantis.srv.oceanbox.io", "https://atlantis.srv.oceanbox.io" ], - "logService" : "https://seq.oceanbox.io", + "logService" : "https://seq.adm.oceanbox.io", "logApiKey": "", "deployEnv": "prod" } diff --git a/charts/atlantis/staging/appsettings.json b/charts/atlantis/staging/appsettings.json index a649dd4a..2dc66678 100644 --- a/charts/atlantis/staging/appsettings.json +++ b/charts/atlantis/staging/appsettings.json @@ -28,7 +28,7 @@ "http://atlantis.beta.oceanbox.io", "https://atlantis.beta.oceanbox.io" ], - "logService" : "https://seq.oceanbox.io", + "logService" : "https://seq.adm.oceanbox.io", "logApiKey": "", "deployEnv": "staging" } diff --git a/charts/atlantis/values-prod.yaml b/charts/atlantis/values-prod.yaml index ce9cc81e..68fdc9cc 100644 --- a/charts/atlantis/values-prod.yaml +++ b/charts/atlantis/values-prod.yaml @@ -7,14 +7,14 @@ ingress: paths: - path: / pathType: ImplementationSpecific - - host: maps.srv.oceanbox.io + - host: maps.oceanbox.io paths: - path: / pathType: ImplementationSpecific tls: - hosts: - atlantis.srv.oceanbox.io - - maps.srv.oceanbox.io + - maps.oceanbox.io secretName: atlantis-tls resources: diff --git a/charts/dex/values-prod.yaml b/charts/dex/values-prod.yaml index a19bd72c..06a6035a 100644 --- a/charts/dex/values-prod.yaml +++ b/charts/dex/values-prod.yaml @@ -9,6 +9,10 @@ ingress: cert-manager.io/cluster-issuer: letsencrypt-production nginx.ingress.kubernetes.io/ssl-redirect: "true" hosts: + - host: idp.oceanbox.io + paths: + - path: / + pathType: ImplementationSpecific - host: idp.srv.oceanbox.io paths: - path: / @@ -16,6 +20,7 @@ ingress: tls: - secretName: prod-dex-tls hosts: + - idp.oceanbox.io - idp.srv.oceanbox.io diff --git a/charts/keycloak/values.yaml b/charts/keycloak/values.yaml index e98b3359..62107bad 100644 --- a/charts/keycloak/values.yaml +++ b/charts/keycloak/values.yaml @@ -25,7 +25,8 @@ ingress: nginx.ingress.kubernetes.io/proxy-buffer-size: 128k nginx.ingress.kubernetes.io/ssl-redirect: "true" enabled: true - extraHosts: [] + extraHosts: + - auth.oceanbox.io extraPaths: [] hostname: auth.srv.oceanbox.io ingressClassName: nginx diff --git a/charts/petimeter/prod/appsettings.json b/charts/petimeter/prod/appsettings.json index d8af46d9..38285f87 100644 --- a/charts/petimeter/prod/appsettings.json +++ b/charts/petimeter/prod/appsettings.json @@ -26,7 +26,7 @@ "https://maps.oceanbox.io", "https://atlantis.srv.oceanbox.io" ], - "logService" : "https://seq.oceanbox.io", + "logService" : "https://seq.adm.oceanbox.io", "logApiKey": "", "deployEnv": "prod" } diff --git a/charts/petimeter/staging/appsettings.json b/charts/petimeter/staging/appsettings.json index d719c505..a3c7ca3d 100644 --- a/charts/petimeter/staging/appsettings.json +++ b/charts/petimeter/staging/appsettings.json @@ -28,7 +28,7 @@ "https://atlantis.srv.oceanbox.io", "https://atlantis.local.oceanbox.io:8080" ], - "logService" : "https://seq.oceanbox.io", + "logService" : "https://seq.adm.oceanbox.io", "logApiKey": "", "deployEnv": "staging" } diff --git a/charts/seq/values.yaml b/charts/seq/values.yaml index 7d9f2152..01f806a3 100644 --- a/charts/seq/values.yaml +++ b/charts/seq/values.yaml @@ -22,7 +22,7 @@ ui: enabled: true path: / hosts: - - seq.beta.oceanbox.io + - seq.adm.oceanbox.io # The ingestion-only API. # This API is a subset of ui that can only ingest events. @@ -33,7 +33,7 @@ ingestion: enabled: false path: / hosts: - - ingestion.seq.beta.oceanbox.io + - ingestion.seq.adm.oceanbox.io # Accept events in the GELF format and forward them to Seq. gelf: @@ -68,7 +68,7 @@ ingress: tls: - secretName: seq-tls hosts: - - seq.beta.oceanbox.io + - seq.adm.oceanbox.io labels: {} resources: diff --git a/charts/sorcerer/prod/appsettings.json b/charts/sorcerer/prod/appsettings.json index 7dc57e57..e3e2ee4b 100644 --- a/charts/sorcerer/prod/appsettings.json +++ b/charts/sorcerer/prod/appsettings.json @@ -18,7 +18,7 @@ ], "archiveSvc": "https://archmeister.srv.oceanbox.io", "cacheDir": "/data/archives/cache", - "logService" : "https://seq.oceanbox.io", + "logService" : "https://seq.adm.oceanbox.io", "logApiKey": "", "deployEnv": "prod" } diff --git a/charts/sorcerer/staging/appsettings.json b/charts/sorcerer/staging/appsettings.json index eb6312aa..28752c3e 100644 --- a/charts/sorcerer/staging/appsettings.json +++ b/charts/sorcerer/staging/appsettings.json @@ -21,7 +21,7 @@ ], "archiveSvc": "https://archmeister.beta.oceanbox.io", "cacheDir": "/data/archives/cache", - "logService" : "https://seq.oceanbox.io", + "logService" : "https://seq.adm.oceanbox.io", "logApiKey": "", "deployEnv": "staging" }