From 48fc5eec5f0e9eb6cc8ce7fec4a1d83d9245bcc8 Mon Sep 17 00:00:00 2001 From: shiipou Date: Mon, 2 Oct 2023 16:24:29 +0200 Subject: [PATCH 1/2] fix: remove initialisation container from build pipeline (k8s version) Signed-off-by: shiipou --- .../lib/lenra/kubernetes/api_services.ex | 59 ------------------- 1 file changed, 59 deletions(-) diff --git a/apps/lenra/lib/lenra/kubernetes/api_services.ex b/apps/lenra/lib/lenra/kubernetes/api_services.ex index 9ef1684c..3e0c9545 100644 --- a/apps/lenra/lib/lenra/kubernetes/api_services.ex +++ b/apps/lenra/lib/lenra/kubernetes/api_services.ex @@ -112,49 +112,6 @@ defmodule Lenra.Kubernetes.ApiServices do name: build_name }, spec: %{ - initContainers: [ - %{ - name: "get-lenra", - image: "alpine/curl", - command: ["/bin/sh"], - args: ["-c", "/tmp/lenra-scripts/get-lenra.sh"], - imagePullPolicy: "IfNotPresent", - volumeMounts: [ - %{ - mountPath: "/tmp/lenra", - name: "lenra" - }, - %{ - mountPath: "/tmp/lenra-scripts", - name: "lenra-scripts" - } - ] - }, - %{ - name: "get-app", - image: "alpine/git", - command: ["/bin/sh"], - args: ["-c", "/tmp/lenra-scripts/get-app.sh"], - envFrom: [ - %{ - secretRef: %{ - name: build_name - } - } - ], - imagePullPolicy: "IfNotPresent", - volumeMounts: [ - %{ - mountPath: "/tmp/app", - name: "app" - }, - %{ - mountPath: "/tmp/lenra-scripts", - name: "lenra-scripts" - } - ] - } - ], containers: [ %{ name: "build", @@ -177,14 +134,6 @@ defmodule Lenra.Kubernetes.ApiServices do }, imagePullPolicy: "IfNotPresent", volumeMounts: [ - %{ - mountPath: "/tmp/app", - name: "app" - }, - %{ - mountPath: "/tmp/lenra", - name: "lenra" - }, %{ mountPath: "/tmp/lenra-scripts", name: "lenra-scripts" @@ -202,14 +151,6 @@ defmodule Lenra.Kubernetes.ApiServices do # 0555 defaultMode: 365 } - }, - %{ - name: "app", - emptyDir: %{} - }, - %{ - name: "lenra", - emptyDir: %{} } ] }, From ca089adedc801b44562f0241c4654cb04d0e036c Mon Sep 17 00:00:00 2001 From: shiipou Date: Mon, 2 Oct 2023 17:16:39 +0200 Subject: [PATCH 2/2] fix: clear workdir Signed-off-by: shiipou --- apps/lenra/lib/lenra/kubernetes/api_services.ex | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/lenra/lib/lenra/kubernetes/api_services.ex b/apps/lenra/lib/lenra/kubernetes/api_services.ex index 3e0c9545..cf223036 100644 --- a/apps/lenra/lib/lenra/kubernetes/api_services.ex +++ b/apps/lenra/lib/lenra/kubernetes/api_services.ex @@ -138,8 +138,7 @@ defmodule Lenra.Kubernetes.ApiServices do mountPath: "/tmp/lenra-scripts", name: "lenra-scripts" } - ], - workingDir: "/tmp/app/" + ] } ], restartPolicy: "Never",