Merge branch 'main' into 2024/variaCleanup

Author: mrnicegyu11

charts/aws-ebs-csi-driver/values.yaml.gotmpl

@@ -0,0 +1,21 @@
+# Relies on ec2 instance profile attached to K8s EC2.
+# It lets ebs csi driver to manage EBS volumes
+
+image:
+    tag: "v1.38.1"
+
+storageClasses:
+  - name: "ebs-sc"
+    parameters:
+        type: "gp3"
+    allowVolumeExpansion: true
+    reclaimPolicy: Retain  # EBS Volume will not be deleted when PV is deleted
+
+controller:
+    extraVolumeTags:
+        Deployment: {{ requiredEnv "MACHINE_FQDN" }}
+    volumeModificationFeature:
+        enabled: true
+    resources:
+        limits:
+            cpu: 1  # no cpu limits by default

charts/portainer/values.ebs-pv.yaml.gotmpl

@@ -0,0 +1,4 @@
+persistence:
+  enabled: true
+  size: "1Gi"  # minimal size for gp3 is 1Gi
+  storageClass: "ebs-sc"

charts/portainer/values.s3-pv.yaml.gotmpl

@@ -0,0 +1,4 @@
+persistence:
+  enabled: true
+  size: "1Gi"
+  storageClass: "csi-s3"

charts/portainer/values.yaml.gotmpl

@@ -18,12 +18,8 @@ serviceAccount:
   # The name of the service account to use.
   # If not set and create is true, a name is generated using the fullname template
   name: portainer-sa-clusteradmin
-persistence:
-  enabled: true
-  size: "1Gi"
-  annotations: {}
-  storageClass: "csi-s3"
-  existingClaim:
+
+persistence: {}
 
 podAnnotations: {}
 podLabels: {}
@@ -61,7 +57,6 @@ ingress:
               port:
                 number: 9000
 
-
 resources:
   limits:
     cpu: 2

services/simcore/docker-compose.yml

@@ -887,12 +887,12 @@ services:
         - traefik.enable=true
         - traefik.docker.network=${PUBLIC_NETWORK}
         - traefik.http.services.${PREFIX_STACK_NAME}_dynamic_scheduler.loadbalancer.server.port=8000
+        - traefik.http.services.${PREFIX_STACK_NAME}_dynamic_scheduler.loadbalancer.sticky.cookie=true
+        - traefik.http.services.${PREFIX_STACK_NAME}_dynamic_scheduler.loadbalancer.sticky.cookie.name=sticky_session
         - traefik.http.routers.${PREFIX_STACK_NAME}_dynamic_scheduler.rule=Host(`${MONITORING_DOMAIN}`) && PathPrefix(`/dynamic-scheduler`)
         - traefik.http.routers.${PREFIX_STACK_NAME}_dynamic_scheduler.entrypoints=https
         - traefik.http.routers.${PREFIX_STACK_NAME}_dynamic_scheduler.tls=true
-        - traefik.http.middlewares.${PREFIX_STACK_NAME}_dynamic_scheduler_replace_regex.replacepathregex.regex=^/dynamic-scheduler/(.*)$$
-        - traefik.http.middlewares.${PREFIX_STACK_NAME}_dynamic_scheduler_replace_regex.replacepathregex.replacement=/$${1}
-        - traefik.http.routers.${PREFIX_STACK_NAME}_dynamic_scheduler.middlewares=${PREFIX_STACK_NAME}_dynamic_scheduler_replace_regex@swarm, ops_gzip@swarm, ops_auth@swarm
+        - traefik.http.routers.${PREFIX_STACK_NAME}_dynamic_scheduler.middlewares=ops_gzip@swarm, ops_auth@swarm
 
 volumes:
   rabbit_data: