Merge branch 'main' into fix/token-error

equinor · Nov 20, 2023 · 27f375a · 27f375a
2 parents cd933fb + 7670fd6
commit 27f375a
Show file tree

Hide file tree

Showing 2 changed files with 299 additions and 380 deletions.
diff --git a/radixconfig.yaml b/radixconfig.yaml
@@ -18,11 +18,11 @@ spec:
         - name: http
           port: 3000
       variables:
-        REACT_APP_AAD_TENANT_ID: ''
-        REACT_APP_AAD_CLIENT_ID: ''
-        REACT_APP_AAD_REDIRECT_URI: ''
-        REACT_APP_BACKEND_URL: ''
-        REACT_APP_BACKEND_API_SCOPE: ''
+        REACT_APP_AAD_TENANT_ID: ""
+        REACT_APP_AAD_CLIENT_ID: ""
+        REACT_APP_AAD_REDIRECT_URI: ""
+        REACT_APP_BACKEND_URL: ""
+        REACT_APP_BACKEND_API_SCOPE: ""
       environmentConfig:
         - environment: dev
         - environment: test
@@ -42,30 +42,31 @@ spec:
         - environment: dev
           imageTagName: latest
           variables:
-            ASPNETCORE_ENVIRONMENT: 'Development'
+            ASPNETCORE_ENVIRONMENT: "Development"
         - environment: test
           imageTagName: latest
           variables:
-            ASPNETCORE_ENVIRONMENT: 'Test'
+            ASPNETCORE_ENVIRONMENT: "Test"
         - environment: prod
           imageTagName: latest
           variables:
-            ASPNETCORE_ENVIRONMENT: 'Production'
+            ASPNETCORE_ENVIRONMENT: "Production"
   jobs:
     - name: pepm-nrresqml
       image: ghcr.io/equinor/pepm-worker-api/pepm-nrresqml:latest
       schedulerPort: 8090
       resources:
         requests:
-          memory: '2048Mi'
-          cpu: '1000m'
+          memory: "2048Mi"
+          cpu: "1000m"
         limits:
-          memory: '4096Mi'
-          cpu: '2000m'
+          memory: "4096Mi"
+          cpu: "2000m"
       payload:
         path: /app/args
       variables:
-        MODELS_PATH: '/mnt/azure-storage/models'
+        MODEL_FOLDER: "/mnt/azure-storage/models"
+        WORKER_FOLDER: "/mnt/azure-storage/worker"
       environmentConfig:
         - environment: dev
           volumeMounts:
@@ -75,30 +76,35 @@ spec:
                 protocol: fuse2
                 container: models
                 uid: 1000
-              streaming:
-                enabled: false
+                accessMode: ReadWriteMany
+                useAdls: true
+                streaming:
+                  enabled: false
             - name: pepm-nrresqml-worker-storage-dev
               path: /mnt/azure-storage/worker
               blobfuse2:
                 protocol: fuse2
                 container: nrresqml
                 uid: 1000
-              streaming:
-                enabled: false
+                accessMode: ReadWriteMany
+                useAdls: true
+                streaming:
+                  enabled: false
     - name: pepm-nrchannest
       image: ghcr.io/equinor/pepm-worker-api/pepm-nrchannest:latest
       schedulerPort: 8090
       resources:
         requests:
-          memory: '4096Mi'
-          cpu: '1000m'
+          memory: "4096Mi"
+          cpu: "1000m"
         limits:
-          memory: '8192Mi'
-          cpu: '2000m'
+          memory: "8192Mi"
+          cpu: "2000m"
       payload:
         path: /app/args
       variables:
-        MODELS_PATH: '/mnt/azure-storage/models'
+        MODEL_FOLDER: "/mnt/azure-storage/models"
+        WORKER_FOLDER: "/mnt/azure-storage/worker"
       environmentConfig:
         - environment: dev
           volumeMounts:
@@ -108,16 +114,62 @@ spec:
                 protocol: fuse2
                 container: models
                 uid: 1000
-              streaming:
-                enabled: false
+                accessMode: ReadWriteMany
+                useAdls: true
+                streaming:
+                  enabled: false
+
             - name: pepm-nrchannest-worker-storage-dev
               path: /mnt/azure-storage/worker
               blobfuse2:
                 protocol: fuse2
                 container: nrchannest
                 uid: 1000
-              streaming:
-                enabled: false
+                accessMode: ReadWriteMany
+                useAdls: true
+                streaming:
+                  enabled: false
+
+    - name: pepm-nrvargrest
+      image: ghcr.io/equinor/pepm-worker-api/pepm-nrvargrest:latest
+      schedulerPort: 8090
+      resources:
+        requests:
+          memory: "4096Mi"
+          cpu: "1000m"
+        limits:
+          memory: "8192Mi"
+          cpu: "2000m"
+      payload:
+        path: /app/args
+      variables:
+        MODEL_FOLDER: "/mnt/azure-storage/models"
+        WORKER_FOLDER: "/mnt/azure-storage/worker"
+      environmentConfig:
+        - environment: dev
+          volumeMounts:
+            - name: pepm-nrvargrest-model-storage-dev
+              path: /mnt/azure-storage/models
+              blobfuse2:
+                protocol: fuse2
+                container: models
+                uid: 1000
+                accessMode: ReadWriteMany
+                useAdls: true
+                streaming:
+                  enabled: false
+
+            - name: pepm-nrvargrest-worker-storage-dev
+              path: /mnt/azure-storage/worker
+              blobfuse2:
+                protocol: fuse2
+                container: nrvargrest
+                uid: 1000
+                accessMode: ReadWriteMany
+                useAdls: true
+                streaming:
+                  enabled: false
+
   privateImageHubs:
     ghcr.io:
       username: hakoneriksson