From 6b9667401ad8d33818b1f6fc93ca898d55820d9c Mon Sep 17 00:00:00 2001
From: Guillaume Lours <705411+glours@users.noreply.github.com>
Date: Wed, 16 Jul 2025 15:50:18 +0200
Subject: [PATCH] fix the helm bridge e2e tests after the latest update of the
 templates

Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
---
 .../templates/0-bridge-namespace.yaml         |  2 +-
 .../templates/bridge-configs.yaml             |  4 ++--
 .../templates/serviceA-deployment.yaml        | 10 +++++++---
 .../templates/serviceA-service.yaml           |  2 +-
 .../templates/serviceB-deployment.yaml        |  8 ++++++--
 .../templates/serviceB-service.yaml           |  2 +-
 .../fixtures/bridge/expected-helm/values.yaml | 19 ++++++++++++++++++-
 7 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/pkg/e2e/fixtures/bridge/expected-helm/templates/0-bridge-namespace.yaml b/pkg/e2e/fixtures/bridge/expected-helm/templates/0-bridge-namespace.yaml
index 40e4b0e23..953ebe7bb 100755
--- a/pkg/e2e/fixtures/bridge/expected-helm/templates/0-bridge-namespace.yaml
+++ b/pkg/e2e/fixtures/bridge/expected-helm/templates/0-bridge-namespace.yaml
@@ -3,6 +3,6 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-    name: bridge
+    name: {{ .Values.namespace }}
     labels:
         com.docker.compose.project: bridge
diff --git a/pkg/e2e/fixtures/bridge/expected-helm/templates/bridge-configs.yaml b/pkg/e2e/fixtures/bridge/expected-helm/templates/bridge-configs.yaml
index 822d2e076..48e8b0cf6 100755
--- a/pkg/e2e/fixtures/bridge/expected-helm/templates/bridge-configs.yaml
+++ b/pkg/e2e/fixtures/bridge/expected-helm/templates/bridge-configs.yaml
@@ -3,8 +3,8 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-    name: bridge
-    namespace: bridge
+    name: {{ .Values.projectName }}
+    namespace: {{ .Values.namespace }}
     labels:
         com.docker.compose.project: bridge
 data:
diff --git a/pkg/e2e/fixtures/bridge/expected-helm/templates/serviceA-deployment.yaml b/pkg/e2e/fixtures/bridge/expected-helm/templates/serviceA-deployment.yaml
index 225ff13a9..afef74e8b 100755
--- a/pkg/e2e/fixtures/bridge/expected-helm/templates/serviceA-deployment.yaml
+++ b/pkg/e2e/fixtures/bridge/expected-helm/templates/serviceA-deployment.yaml
@@ -10,13 +10,13 @@ metadata:
         com.docker.compose.service: serviceA
         app.kubernetes.io/managed-by: Helm
 spec:
-    replicas: 1
+    replicas: {{ .Values.deployment.defaultReplicas }}
     selector:
         matchLabels:
             com.docker.compose.project: bridge
             com.docker.compose.service: serviceA
     strategy:
-        type: Recreate
+        type: {{ .Values.deployment.strategy }}
     template:
         metadata:
             labels:
@@ -28,6 +28,10 @@ spec:
                 - name: servicea
                   image: {{ .Values.serviceA.image }}
                   imagePullPolicy: {{ .Values.serviceA.imagePullPolicy }}
+                  resources:
+                    limits:
+                        cpu: {{ .Values.resources.defaultCpuLimit }}
+                        memory: {{ .Values.resources.defaultMemoryLimit }}
                   ports:
                     - name: servicea-8080
                       containerPort: 8080
@@ -39,7 +43,7 @@ spec:
             volumes:
                 - name: etc-my-config1-txt
                   configMap:
-                    name: bridge
+                    name: {{ .Values.projectName }}
                     items:
                         - key: my-config
                           path: my-config
diff --git a/pkg/e2e/fixtures/bridge/expected-helm/templates/serviceA-service.yaml b/pkg/e2e/fixtures/bridge/expected-helm/templates/serviceA-service.yaml
index 4b29a6477..2138281ba 100755
--- a/pkg/e2e/fixtures/bridge/expected-helm/templates/serviceA-service.yaml
+++ b/pkg/e2e/fixtures/bridge/expected-helm/templates/serviceA-service.yaml
@@ -12,7 +12,7 @@ metadata:
         com.docker.compose.service: serviceA
         app.kubernetes.io/managed-by: Helm
 spec:
-    type: LoadBalancer
+    type: {{ .Values.service.type }}
     selector:
         com.docker.compose.project: bridge
         com.docker.compose.service: serviceA
diff --git a/pkg/e2e/fixtures/bridge/expected-helm/templates/serviceB-deployment.yaml b/pkg/e2e/fixtures/bridge/expected-helm/templates/serviceB-deployment.yaml
index abdf8b242..7ea9d998f 100755
--- a/pkg/e2e/fixtures/bridge/expected-helm/templates/serviceB-deployment.yaml
+++ b/pkg/e2e/fixtures/bridge/expected-helm/templates/serviceB-deployment.yaml
@@ -10,13 +10,13 @@ metadata:
         com.docker.compose.service: serviceB
         app.kubernetes.io/managed-by: Helm
 spec:
-    replicas: 1
+    replicas: {{ .Values.deployment.defaultReplicas }}
     selector:
         matchLabels:
             com.docker.compose.project: bridge
             com.docker.compose.service: serviceB
     strategy:
-        type: Recreate
+        type: {{ .Values.deployment.strategy }}
     template:
         metadata:
             labels:
@@ -29,6 +29,10 @@ spec:
                 - name: serviceb
                   image: {{ .Values.serviceB.image }}
                   imagePullPolicy: {{ .Values.serviceB.imagePullPolicy }}
+                  resources:
+                    limits:
+                        cpu: {{ .Values.resources.defaultCpuLimit }}
+                        memory: {{ .Values.resources.defaultMemoryLimit }}
                   ports:
                     - name: serviceb-8082
                       containerPort: 8082
diff --git a/pkg/e2e/fixtures/bridge/expected-helm/templates/serviceB-service.yaml b/pkg/e2e/fixtures/bridge/expected-helm/templates/serviceB-service.yaml
index 52ec6fe94..6860f3d28 100755
--- a/pkg/e2e/fixtures/bridge/expected-helm/templates/serviceB-service.yaml
+++ b/pkg/e2e/fixtures/bridge/expected-helm/templates/serviceB-service.yaml
@@ -10,7 +10,7 @@ metadata:
         com.docker.compose.service: serviceB
         app.kubernetes.io/managed-by: Helm
 spec:
-    type: LoadBalancer
+    type: {{ .Values.service.type }}
     selector:
         com.docker.compose.project: bridge
         com.docker.compose.service: serviceB
diff --git a/pkg/e2e/fixtures/bridge/expected-helm/values.yaml b/pkg/e2e/fixtures/bridge/expected-helm/values.yaml
index b312fbc69..783159276 100755
--- a/pkg/e2e/fixtures/bridge/expected-helm/values.yaml
+++ b/pkg/e2e/fixtures/bridge/expected-helm/values.yaml
@@ -1,8 +1,25 @@
 #! values.yaml
+# Project Name
+projectName: bridge
 # Namespace
 namespace: bridge
+# Default deployment settings
+deployment:
+    strategy: Recreate
+    defaultReplicas: 1
+# Default resource limits
+resources:
+    defaultCpuLimit: "100m"
+    defaultMemoryLimit: "512Mi"
+# Service settings
+service:
+    type: LoadBalancer
+# Storage settings
+storage:
+    defaultStorageClass: "hostpath"
+    defaultSize: "100Mi"
+    defaultAccessMode: "ReadWriteOnce"
 # Services variables
-
 serviceA:
     image: alpine
     imagePullPolicy: IfNotPresent