fix the helm bridge e2e tests after the latest update of the templates

Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>

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

pkg/e2e/fixtures/bridge/expected-helm/templates/bridge-configs.yaml

@@ -3,8 +3,8 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-    name: bridge
+    name: {{ .Values.projectName }}
-    namespace: bridge
+    namespace: {{ .Values.namespace }}
     labels:
         com.docker.compose.project: bridge
 data:

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

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

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

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

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