Update CI jobs needs and helms charts

.github/workflows/pr.yml

@@ -74,7 +74,7 @@ jobs:
 
   test-e2e:
     name: Run E2E tests
-    needs: [tag-pr, build-backend]
+    needs: [build-backend, build-frontend]
     uses: ./.github/workflows/test-on-kube.yml
     secrets:
       API_OVH_TOKEN: ${{ secrets.API_OVH_TOKEN }}

.github/workflows/test-on-kube.yml

@@ -33,7 +33,13 @@ jobs:
       - name: Set up ingress controller 
         run: |
           helm repo add traefik https://traefik.github.io/charts && helm repo update
-          helm install --namespace ingress-traefik --create-namespace traefik traefik/traefik --values ./infra/kube/kind/traefik-values.yml 
+          helm upgrade \
+            --install \
+            --wait \
+            --namespace traefik \
+            --create-namespace \
+            --values ./infra/kube/kind/traefik-values.yml \
+            traefik traefik/traefik
 
       - name: Add hosts to /etc/hosts
         run: |
@@ -56,7 +62,6 @@ jobs:
             --set-string backend.secret.values.AWS_SECRET_ACCESS_KEY="${{ secrets.AWS_SECRET_ACCESS_KEY }}" \
             --set-string backend.secret.values.X_OVH_TOKEN="${{ secrets.X_OVH_TOKEN }}" \
             --set-string backend.secret.values.API_OVH_TOKEN="${{ secrets.API_OVH_TOKEN }}"
-          for i in $(kubectl get deploy -o name); do kubectl rollout status $i -w --timeout=130s; done
 
       - name: Display pod logs on failure
         if: failure() && steps.tests.outcome == 'failure'

infra/kube/helm/templates/service.yaml

@@ -9,8 +9,6 @@ spec:
   ports:
     - port: {{ .Values.frontend.service.port }}
       targetPort: {{ .Values.frontend.service.containerPort }}
-      protocol: TCP
-      name: http
   selector:
     {{- include "basegun.FrontSelectorLabels" . | nindent 4 }}
 ---
@@ -25,7 +23,5 @@ spec:
   ports:
     - port: {{ .Values.backend.service.port }}
       targetPort: {{ .Values.backend.service.containerPort }}
-      protocol: TCP
-      name: http
   selector:
     {{- include "basegun.BackSelectorLabels" . | nindent 4 }}

infra/kube/helm/values-dso.yaml

@@ -34,7 +34,7 @@ backend:
     repository: harbor.apps.c6.numerique-interieur.com/mi-basegun-test/basegun-backend
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.
-    tag: feature-adapt-infra-for-dso-env
+    tag: develop
     imagePullSecrets: []
   podAnnotations: {}
   podSecurityContext: {}
@@ -49,7 +49,7 @@ backend:
   logs:
     repository: ghcr.io/datalab-mi/basegun/filebeat-rootless
     tag: 6.5.4
-    pullPolicy: IfNotPresent
+    pullPolicy: Always
   service:
     type: ClusterIP
     port: 5000
@@ -86,9 +86,9 @@ frontend:
   replicaCount: 1
   image:
     repository: harbor.apps.c6.numerique-interieur.com/mi-basegun-test/basegun-frontend
-    pullPolicy: IfNotPresent
+    pullPolicy: Always
     # Overrides the image tag whose default is the chart appVersion.
-    tag: feature-adapt-infra-for-dso-env
+    tag: develop
     imagePullSecrets: []
   podAnnotations: {}
   podSecurityContext: {}