diff --git a/charts/archmeister/prod/appsettings.json b/charts/archmeister/prod/appsettings.json index 8f8ff4cd..b906402d 100644 --- a/charts/archmeister/prod/appsettings.json +++ b/charts/archmeister/prod/appsettings.json @@ -29,16 +29,14 @@ "https://maps.relic.oceanbox.io", "https://sorcerer.data.oceanbox.io", "https://sorcerer.data.srv.oceanbox.io", - "https://sorcerer.hpc.oceanbox.io", - "https://jonas-sorcerer.ekman.oceanbox.io", - "https://beta.sorcerer.ekman.oceanbox.io", - "https://simkir-sorcerer.ekman.oceanbox.io", - "https://stig-sorcerer.ekman.oceanbox.io", + "https://sorcerer.jonas.ekman.oceanbox.io", + "https://sorcerer.simkir..ekman.oceanbox.io", + "https://sorcerer.stig.ekman.oceanbox.io", "https://atlantis.beta.oceanbox.io", - "https://jonas-atlantis.beta.oceanbox.io", - "https://simkir-atlantis.beta.oceanbox.io", - "https://stig-atlantis.beta.oceanbox.io", - "https://a.local.oceanbox.io:8080" + "https://atlantis.jonas.tilt.oceanbox.io", + "https://atlantis.stig.tilt.oceanbox.io", + "https://atlantis.simkir.tilt.oceanbox.io", + "https://atlantis.local.oceanbox.io:8080" ], "logService" : "https://seq.adm.oceanbox.io", "logApiKey": "", diff --git a/charts/archmeister/staging/appsettings.json b/charts/archmeister/staging/appsettings.json index 2e8ad5b4..1f30f2f4 100644 --- a/charts/archmeister/staging/appsettings.json +++ b/charts/archmeister/staging/appsettings.json @@ -29,10 +29,10 @@ "https://sorcerer.beta.data.oceanbox.io", "https://sorcerer.hpc.oceanbox.io", "https://maps.oceanbox.io", - "https://jonas-atlantis.beta.oceanbox.io", - "https://simkir-atlantis.beta.oceanbox.io", - "https://stig-atlantis.beta.oceanbox.io", - "https://atlantis.tilt.beta.oceanbox.io:8080" + "https://atlantis.jonas.tilt.oceanbox.io", + "https://atlantis.stig.tilt.oceanbox.io", + "https://atlantis.simkir.tilt.oceanbox.io", + "https://atlantis.local.oceanbox.io:8080" ], "logService" : "https://seq.adm.oceanbox.io", "logApiKey": "", diff --git a/charts/dex/base/config.yaml b/charts/dex/base/config.yaml index 9ce73d64..990911bd 100644 --- a/charts/dex/base/config.yaml +++ b/charts/dex/base/config.yaml @@ -87,11 +87,10 @@ staticClients: - 'https://atlantis.beta.oceanbox.io/signin-oidc' - 'https://beta.oceanbox.io/signin-oidc' - 'https://atlas.oceanbox.io/signin-oidc' - - 'https://jonas-atlantis.beta.oceanbox.io/signin-oidc' - - 'https://stig-atlantis.beta.oceanbox.io/signin-oidc' - - 'https://simkir-atlantis.beta.oceanbox.io/signin-oidc' + - 'https://atlantis.jonas.tilt.oceanbox.io/signin-oidc' + - 'https://atlantis.stig.tilt.oceanbox.io/signin-oidc' + - 'https://atlantis.simkir.tilt.oceanbox.io/signin-oidc' - 'https://atlantis.local.oceanbox.io:8080/signin-oidc' - - 'https://atlantis.tilt.oceanbox.io:8080/signin-oidc' name: 'Atlantis dev' secret: 3QjfSPmAemjn34XVA2o1fvoS7I4gKvOR - id: petimeter @@ -102,9 +101,9 @@ staticClients: - id: petimeter_dev redirectURIs: - 'https://petimeter.beta.oceanbox.io/signin-oidc' - - 'https://jonas-tilt-petimeter.beta.oceanbox.io/signin-oidc' - - 'https://stig-tilt-petimeter.beta.oceanbox.io/signin-oidc' - - 'https://simkir-tilt-petimeter.beta.oceanbox.io/signin-oidc' + - 'https://petimeter.jonas.tilt.oceanbox.io/signin-oidc' + - 'https://petimeter.stig.tilt.oceanbox.io/signin-oidc' + - 'https://petimeter.simkir.tilt.oceanbox.io/signin-oidc' - 'https://petimeter.local.oceanbox.io:8080/signin-oidc' name: 'Petimeter dev' secret: kfngKJF9EKVBnnvgkdmPfs0qw3rmjslk @@ -119,9 +118,9 @@ staticClients: - 'https://dev.sorcerer.ekman.oceanbox.io/signin-oidc' - 'https://sorcerer.ekman.oceanbox.io/signin-oidc' - 'https://sorcerer.hpc.oceanbox.io/signin-oidc' - - 'https://jonas-tilt-sorcerer.ekman.oceanbox.io/signin-oidc' - - 'https://simkir-tilt-sorcerer.ekman.oceanbox.io/signin-oidc' - - 'https://sorcerer.local.oceanbox.io:11080/signin-oidc' + - 'https://sorcerer.jonas.tilt.oceanbox.io/signin-oidc' + - 'https://sorcerer.stig.tilt.oceanbox.io/signin-oidc' + - 'https://sorcerer.simkir.tilt.oceanbox.io/signin-oidc' name: 'Sorcerer dev' secret: cyrgDr1UzhQrJn8nRVqEt9BJ9mLk3OBy - id: archmeister @@ -132,9 +131,9 @@ staticClients: - id: archmeister_dev redirectURIs: - 'https://archmeister.beta.oceanbox.io/signin-oidc' - - 'https://jonas-archmeister.beta.oceanbox.io/signin-oidc' - - 'https://simkir-archmeister.beta.oceanbox.io/signin-oidc' - - 'https://r.local.oceanbox.io:11080/signin-oidc' + - 'https://archmeister.jonas.tilt.oceanbox.io/signin-oidc' + - 'https://archmeister.stig.tilt.oceanbox.io/signin-oidc' + - 'https://archmeister.simkir.tilt.oceanbox.io/signin-oidc' - 'https://archmeister.local.oceanbox.io:9080/signin-oidc' name: 'Archmeister dev' secret: Dae1eekeedeuKaoCiesh1Jei6aishe8I diff --git a/charts/hipster/values-staging.yaml b/charts/hipster/values-staging.yaml index fdec4455..3d52595d 100644 --- a/charts/hipster/values-staging.yaml +++ b/charts/hipster/values-staging.yaml @@ -1,5 +1,5 @@ image: - tag: 9901ca9a-debug + tag: 130fcebb-debug ingress: annotations: cert-manager.io/cluster-issuer: letsencrypt-staging diff --git a/charts/petimeter/values-staging.yaml b/charts/petimeter/values-staging.yaml index 183a7618..a366529e 100644 --- a/charts/petimeter/values-staging.yaml +++ b/charts/petimeter/values-staging.yaml @@ -1,5 +1,5 @@ image: - tag: 58d77207-debug + tag: c9cf94b1-debug ingress: annotations: cert-manager.io/cluster-issuer: letsencrypt-staging diff --git a/charts/sorcerer/staging/appsettings.json b/charts/sorcerer/staging/appsettings.json index adfc27f9..fd05141c 100644 --- a/charts/sorcerer/staging/appsettings.json +++ b/charts/sorcerer/staging/appsettings.json @@ -12,11 +12,12 @@ "https://localhost:8080", "https://maps.oceanbox.io", "https://atlantis.dev.oceanbox.io", - "https://jonas-atlantis.beta.oceanbox.io", - "https://stig-atlantis.beta.oceanbox.io", - "https://simkir-atlantis.beta.oceanbox.io", "https://atlantis.beta.oceanbox.io", - "https://atlantis.tilt.beta.oceanbox.io:8080" + "https://atlantis.jonas.tilt.oceanbox.io", + "https://atlantis.stig.tilt.oceanbox.io", + "https://atlantis.simker.tilt.oceanbox.io", + "https://atlantis.local.oceanbox.io:8080" + ], "archiveSvc": "https://archmeister.beta.oceanbox.io", "cacheDir": "/data/archives/cache", diff --git a/vcluster/chart/templates/vcluster.yaml b/vcluster/chart/templates/vcluster.yaml index e1a6daa8..8ae93d93 100644 --- a/vcluster/chart/templates/vcluster.yaml +++ b/vcluster/chart/templates/vcluster.yaml @@ -71,6 +71,8 @@ spec: to: "atlantis/staging-archmeister-rw" - from: "{{ .Release.Namespace }}/jaeger-collector" to: "atlantis/jaeger-collector" + - from: "idp/{{ .Values.environment }}-cerbos" + to: "idp/{{ .Values.environment }}-cerbos" sync: secrets: all: true