Merge pull request #1072 from equinor/master

Added file limit to buildah (#1071)
equinor · Mar 21, 2024 · 10049c9 · 10049c9
2 parents 8e1cfea + 75b8bd3
commit 10049c9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/charts/radix-operator/Chart.yaml b/charts/radix-operator/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: radix-operator
 version: 1.30.5
-appVersion: 1.50.4
+appVersion: 1.50.5
 kubeVersion: ">=1.24.0"
 description: Radix Operator
 keywords:

diff --git a/pipeline-runner/steps/build_acr.go b/pipeline-runner/steps/build_acr.go
@@ -430,6 +430,7 @@ func getBuildahContainerCommand(containerImageRegistry, secretArgsString string,
 		AddArgf("--storage-driver=overlay").
 		AddArgf("--isolation=chroot").
 		AddArgf("--jobs 0").
+		AddArgf("--ulimit nofile=4096:4096").
 		AddArgf(secretArgsString).
 		AddArgf("--file %s%s", context, componentImage.Dockerfile).
 		AddArgf(`--build-arg RADIX_GIT_COMMIT_HASH="${RADIX_GIT_COMMIT_HASH}"`).

diff --git a/pipeline-runner/steps/build_test.go b/pipeline-runner/steps/build_test.go
@@ -1407,7 +1407,7 @@ func (s *buildTestSuite) Test_BuildJobSpec_BuildKit() {
 			"cp /radix-private-image-hubs/.dockerconfigjson /home/build/auth.json && ",
 			fmt.Sprintf("/usr/bin/buildah login --username ${BUILDAH_USERNAME} --password ${BUILDAH_PASSWORD} %s && ", pipeline.PipelineArguments.ContainerRegistry),
 			fmt.Sprintf("/usr/bin/buildah login --username ${BUILDAH_CACHE_USERNAME} --password ${BUILDAH_CACHE_PASSWORD} %s && ", pipeline.PipelineArguments.AppContainerRegistry),
-			"/usr/bin/buildah build --storage-driver=overlay --isolation=chroot --jobs 0 ",
+			"/usr/bin/buildah build --storage-driver=overlay --isolation=chroot --jobs 0 --ulimit nofile=4096:4096 ",
 			fmt.Sprintf("--file %s%s ", "/workspace/path2/", dockerFile),
 			"--build-arg RADIX_GIT_COMMIT_HASH=\"${RADIX_GIT_COMMIT_HASH}\" ",
 			"--build-arg RADIX_GIT_TAGS=\"${RADIX_GIT_TAGS}\" ",
@@ -1500,7 +1500,7 @@ func (s *buildTestSuite) Test_BuildJobSpec_BuildKit_PushImage() {
 			"cp /radix-private-image-hubs/.dockerconfigjson /home/build/auth.json && ",
 			fmt.Sprintf("/usr/bin/buildah login --username ${BUILDAH_USERNAME} --password ${BUILDAH_PASSWORD} %s && ", pipeline.PipelineArguments.ContainerRegistry),
 			fmt.Sprintf("/usr/bin/buildah login --username ${BUILDAH_CACHE_USERNAME} --password ${BUILDAH_CACHE_PASSWORD} %s && ", pipeline.PipelineArguments.AppContainerRegistry),
-			"/usr/bin/buildah build --storage-driver=overlay --isolation=chroot --jobs 0 ",
+			"/usr/bin/buildah build --storage-driver=overlay --isolation=chroot --jobs 0 --ulimit nofile=4096:4096 ",
 			fmt.Sprintf("--file %s%s ", "/workspace/path2/", dockerFile),
 			"--build-arg RADIX_GIT_COMMIT_HASH=\"${RADIX_GIT_COMMIT_HASH}\" ",
 			"--build-arg RADIX_GIT_TAGS=\"${RADIX_GIT_TAGS}\" ",
@@ -1581,7 +1581,7 @@ func (s *buildTestSuite) Test_BuildJobSpec_BuildKit_WithBuildSecrets() {
 			"cp /radix-private-image-hubs/.dockerconfigjson /home/build/auth.json && ",
 			fmt.Sprintf("/usr/bin/buildah login --username ${BUILDAH_USERNAME} --password ${BUILDAH_PASSWORD} %s && ", pipeline.PipelineArguments.ContainerRegistry),
 			fmt.Sprintf("/usr/bin/buildah login --username ${BUILDAH_CACHE_USERNAME} --password ${BUILDAH_CACHE_PASSWORD} %s && ", pipeline.PipelineArguments.AppContainerRegistry),
-			"/usr/bin/buildah build --storage-driver=overlay --isolation=chroot --jobs 0 ",
+			"/usr/bin/buildah build --storage-driver=overlay --isolation=chroot --jobs 0 --ulimit nofile=4096:4096 ",
 			"--secret id=SECRET1,src=/build-secrets/SECRET1 --secret id=SECRET2,src=/build-secrets/SECRET2 ",
 			fmt.Sprintf("--file %s%s ", "/workspace/path2/", dockerFile),
 			"--build-arg RADIX_GIT_COMMIT_HASH=\"${RADIX_GIT_COMMIT_HASH}\" ",