fix: merge with main

charts/atlantis/Chart.yaml

@@ -2,5 +2,9 @@ apiVersion: v2
 name: atlantis
 description: Atlantis map and simulation service
 type: application
-version: v2.87.1
+# This is the chart version. This version number should be incremented each time you make changes
-appVersion: v2.87.1
+# to the chart and its templates, including the app version.
+version: v2.97.5
+# 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.97.5

charts/atlantis/values.yaml

@@ -6,7 +6,7 @@ replicaCount: 1
 
 image:
   repository: registry.gitlab.com/oceanbox/atlantis
-  tag: v2.87.1
+  tag: v2.97.5
   pullPolicy: IfNotPresent
 
 init:

charts/sorcerer/Chart.yaml

@@ -2,5 +2,9 @@ apiVersion: v2
 name: sorcerer
 description: A Helm chart for Kubernetes
 type: application
-version: v4.9.0
+# This is the chart version. This version number should be incremented each time you make changes
-appVersion: v4.9.0
+# to the chart and its templates, including the app version.
+version: v4.16.3
+# 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.16.3

charts/sorcerer/values.yaml

@@ -6,7 +6,7 @@ replicaCount: 1
 
 image:
   repository: registry.gitlab.com/oceanbox/sorcerer
-  tag: v4.9.0
+  tag: v4.16.3
   pullPolicy: IfNotPresent
 
 init:

values/atlantis/values-prod.yaml

@@ -1,8 +1,5 @@
 replicaCount: 2
 
-image:
-  tag: v2.97.5
-
 podAnnotations:
   dapr.io/app-id: "prod-atlantis"
 

values/petimeter/manifests/acl.json

@@ -347,6 +347,48 @@
             }
         ]
     },
+    {
+        "domain": "bioceanor.com",
+        "access": [
+            {
+                "matching": ".*@bioceanor.com",
+                "group": "/bioceanor",
+                "roles": [ "user" ],
+                "capabilities": [
+                    "run:transport",
+                    "run:sedimentation"
+                ]
+            }
+        ]
+    },
+    {
+        "domain": "oceanvisuals.no",
+        "access": [
+            {
+                "matching": ".*@oceanvisuals.no",
+                "group": "/oceanvisuals",
+                "roles": [ "user" ],
+                "capabilities": [
+                    "run:transport",
+                    "run:sedimentation"
+                ]
+            }
+        ]
+    },
+    {
+        "domain": "capgemini.com",
+        "access": [
+            {
+                "matching": ".*@capgemini.com",
+                "group": "/capgemini",
+                "roles": [ "user" ],
+                "capabilities": [
+                    "run:transport",
+                    "run:sedimentation"
+                ]
+            }
+        ]
+    },
     {
         "domain": "gmail.com",
         "access": [

values/sorcerer/values-prod.yaml

@@ -1,8 +1,5 @@
 replicaCount: 2
 
-image:
-  tag: v4.16.3
-
 podAnnotations:
   dapr.io/enabled: "true"
   dapr.io/app-id: "prod-sorcerer"