Merge branch 'main' of gitlab.com:oceanbox/manifests

applications/sorcerer.yaml

@@ -10,12 +10,12 @@ spec:
       elements:
       - cluster: https://10.255.241.99:4443
         env: prod
-        hostname: sorcerer.srv.archive.oceanbox.io
+        hostname: sorcerer.data.oceanbox.io
         autoSync: false
         prune: true
       - cluster: https://10.255.241.99:4443
         env: staging
-        hostname: sorcerer.beta.archive.oceanbox.io
+        hostname: sorcerer.ekman.oceanbox.io
         autoSync: true
         prune: true
   template:
@@ -24,7 +24,7 @@ spec:
     spec:
       project: atlantis
       destination:
-        namespace: oceanbox
+        namespace: sorcerer
         server: '{{ .cluster }}'
       sources:
       - repoURL: https://gitlab.com/oceanbox/manifests.git
@@ -43,4 +43,5 @@ spec:
       syncPolicy:
         automated:
           prune: {{ .prune }}
+          selfHeal: false
     {{- end }}

charts/archmeister/prod/appsettings.json

@@ -28,14 +28,14 @@
         "https://atlantis.srv.oceanbox.io",
         "https://maps.relic.oceanbox.io",
         "https://sorcerer.data.oceanbox.io",
-        "https://sorcerer.data.srv.oceanbox.io",
+        "https://sorcerer.ekman.oceanbox.io",
         "https://sorcerer.jonas.ekman.oceanbox.io",
-        "https://sorcerer.simkir..ekman.oceanbox.io",
+        "https://sorcerer.simkir.ekman.oceanbox.io",
         "https://sorcerer.stig.ekman.oceanbox.io",
         "https://atlantis.beta.oceanbox.io",
-        "https://atlantis.jonas.tilt.oceanbox.io",
-        "https://atlantis.stig.tilt.oceanbox.io",
-        "https://atlantis.simkir.tilt.oceanbox.io",
+        "https://atlantis.jonas.dev.oceanbox.io",
+        "https://atlantis.stig.dev.oceanbox.io",
+        "https://atlantis.simkir.dev.oceanbox.io",
         "https://atlantis.local.oceanbox.io:8080"
     ],
     "logService" : "https://seq.adm.oceanbox.io",

charts/archmeister/staging/appsettings.json

@@ -24,14 +24,13 @@
         "dataProtectionKeys": "DataProtection-Keys"
     },
     "allowedOrigins": [
-        "https://atlantis.beta.oceanbox.io",
-        "https://sorcerer.data.beta.oceanbox.io",
-        "https://sorcerer.beta.data.oceanbox.io",
-        "https://sorcerer.hpc.oceanbox.io",
         "https://maps.oceanbox.io",
-        "https://atlantis.jonas.tilt.oceanbox.io",
-        "https://atlantis.stig.tilt.oceanbox.io",
-        "https://atlantis.simkir.tilt.oceanbox.io",
+        "https://atlantis.beta.oceanbox.io",
+        "https://sorcerer.data.oceanbox.io",
+        "https://sorcerer.ekman.oceanbox.io",
+        "https://atlantis.jonas.dev.oceanbox.io",
+        "https://atlantis.stig.dev.oceanbox.io",
+        "https://atlantis.simkir.dev.oceanbox.io",
         "https://atlantis.local.oceanbox.io:8080"
     ],
     "logService" : "https://seq.adm.oceanbox.io",

charts/atlantis/chart/Chart.yaml

@@ -12,7 +12,7 @@ description: Atlantis map and simulation service
 type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: v2.78.7
+version: v2.78.8
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: v2.78.7
+appVersion: v2.78.8

charts/atlantis/chart/values.yaml

@@ -5,7 +5,7 @@
 replicaCount: 1
 image:
   repository: registry.gitlab.com/oceanbox/atlantis
-  tag: v2.78.7
+  tag: v2.78.8
   pullPolicy: IfNotPresent
 init:
   enabled: false

charts/atlantis/prod/appsettings.json

@@ -23,7 +23,7 @@
         "dataProtectionKeys": "DataProtection-Keys"
     },
     "archmeister" : "https://archmeister.srv.oceanbox.io",
-    "sorcerer" : "https://sorcerer.data.srv.oceanbox.io",
+    "sorcerer" : "https://sorcerer.data.oceanbox.io",
     "allowedOrigins": [
         "http://maps.oceanbox.io",
         "https://maps.oceanbox.io",

charts/atlantis/staging/appsettings.json

@@ -23,7 +23,7 @@
         "dataProtectionKeys": "DataProtection-Keys"
     },
     "archmeister" : "https://archmeister.beta.oceanbox.io",
-    "sorcerer" : "https://sorcerer.data.beta.oceanbox.io",
+    "sorcerer" : "https://sorcerer.ekman.oceanbox.io",
     "allowedOrigins": [
         "http://atlantis.beta.oceanbox.io",
         "https://atlantis.beta.oceanbox.io"

charts/atlantis/values-staging.yaml

@@ -1,5 +1,5 @@
 image:
-  tag: ba9e9e3f-debug
+  tag: 8f201d7e-debug
 ingress:
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-production

charts/dex/base/config.yaml

@@ -109,18 +109,16 @@ staticClients:
     secret: kfngKJF9EKVBnnvgkdmPfs0qw3rmjslk
   - id: sorcerer
     redirectURIs:
+      - 'https://sorcerer.data.oceanbox.io/signin-oidc'
       - 'https://sorcerer.ekman.oceanbox.io/signin-oidc'
-      - 'https://sorcerer.hpc.oceanbox.io/signin-oidc'
     name: 'Sorcerer'
     secret: sIUXxSQLaTJiLCQ9AqBhmEbAL9lubHGB
   - id: sorcerer_dev
     redirectURIs:
-      - 'https://dev.sorcerer.ekman.oceanbox.io/signin-oidc'
       - 'https://sorcerer.ekman.oceanbox.io/signin-oidc'
-      - 'https://sorcerer.hpc.oceanbox.io/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'
+      - 'https://sorcerer.jonas.dev.oceanbox.io/signin-oidc'
+      - 'https://sorcerer.stig.dev.oceanbox.io/signin-oidc'
+      - 'https://sorcerer.simkir.dev.oceanbox.io/signin-oidc'
     name: 'Sorcerer dev'
     secret: cyrgDr1UzhQrJn8nRVqEt9BJ9mLk3OBy
   - id: archmeister

charts/hipster/values-staging.yaml

@@ -1,5 +1,5 @@
 image:
-  tag: 9bbc5bf0-debug
+  tag: 130fcebb-debug
 ingress:
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-staging

charts/petimeter/values-staging.yaml

@@ -1,5 +1,5 @@
 image:
-  tag: 33540e54-debug
+  tag: c9cf94b1-debug
 ingress:
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-staging

charts/sorcerer/chart/Chart.yaml

@@ -12,7 +12,7 @@ description: A Helm chart for Kubernetes
 type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: v4.7.6
+version: v4.7.7
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: v4.7.6
+appVersion: v4.7.7

charts/sorcerer/chart/values.yaml

@@ -5,7 +5,7 @@
 replicaCount: 1
 image:
   repository: registry.gitlab.com/oceanbox/sorcerer
-  tag: v4.7.6
+  tag: v4.7.7
   pullPolicy: IfNotPresent
 init:
   enabled: false

charts/sorcerer/prod/appsettings.json

@@ -13,6 +13,7 @@
         "https://maps.oceanbox.io",
         "https://atlantis.srv.oceanbox.io",
         "https://maps.relic.oceanbox.io",
+        "https://atlantis.beta.oceanbox.io",
         "https://atlantis.dev.oceanbox.io",
         "https://atlantis.local.oceanbox.io:8080"
     ],

charts/sorcerer/staging/appsettings.json

@@ -11,11 +11,12 @@
         "http://localhost:8080",
         "https://localhost:8080",
         "https://maps.oceanbox.io",
+        "https://atlantis.srv.oceanbox.io",
         "https://atlantis.dev.oceanbox.io",
         "https://atlantis.beta.oceanbox.io",
-        "https://atlantis.jonas.tilt.oceanbox.io",
-        "https://atlantis.stig.tilt.oceanbox.io",
-        "https://atlantis.simker.tilt.oceanbox.io",
+        "https://atlantis.jonas.dev.oceanbox.io",
+        "https://atlantis.stig.dev.oceanbox.io",
+        "https://atlantis.simker.dev.oceanbox.io",
         "https://atlantis.local.oceanbox.io:8080"
 
     ],

charts/sorcerer/values-prod.yaml

@@ -2,13 +2,13 @@ ingress:
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-production
   hosts:
-    - host: sorcerer.data.srv.oceanbox.io
+    - host: sorcerer.data.oceanbox.io
       paths:
         - path: /
           pathType: ImplementationSpecific
   tls:
     - hosts:
-       - sorcerer.data.srv.oceanbox.io
+       - sorcerer.data.oceanbox.io
       secretName: prod-sorcerer-tls
 
 persistence:

charts/sorcerer/values-staging.yaml

@@ -1,17 +1,17 @@
 image:
-  tag: 3561941d-debug
+  tag: 69ff1ba7-debug
 ingress:
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-production
     # nginx.ingress.kubernetes.io/whitelist-source-range: 10.0.0.0/8,172.16.0.0/12,192.168.0.0/16
   hosts:
-    - host: sorcerer.data.beta.oceanbox.io
+    - host: sorcerer.ekman.oceanbox.io
       paths:
         - path: /
           pathType: ImplementationSpecific
   tls:
     - hosts:
-        - sorcerer.data.beta.oceanbox.io
+        - sorcerer.ekman.oceanbox.io
       secretName: staging-sorcerer-tls
 persistence:
   existingClaim: staging-oceanbox-archives

vcluster/chart/templates/vcluster.yaml

@@ -172,7 +172,7 @@ spec:
             helm:
               - chart:
                   name: dapr
-                  version: 1.12.5
+                  version: 1.13.2
                   repo: https://dapr.github.io/helm-charts/
                 release:
                   name: dapr