zuul/nodepool
Code Issues Proposed changes

Kubernetes/OpenShift Provider: Don't Require Bash in Container Images

Browse Source 
Currently the Kubernetes and OpenShift providers set the entrypoint
of their build node pods to `/bin/bash`, which then requires `bash`
to be available in the respective container image. This might not
always be the case (e.g. with Alpine based images).
This change makes sure the entrypoint is set to `/bin/sh`, which we
can more reliably assume to be available in the container image.

Change-Id: I799ea95b715e50d9c22e66cc80579cf119db8f38
This commit is contained in:
Benjamin Schanzel 2020-03-10 11:11:51 +01:00
parent d8f1118153
commit 7d7b08fadf
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nodepool/driver/kubernetes/provider.py
View File

@ -277,7 +277,7 @@ class KubernetesProvider(Provider):
'name': label.name, 'name': label.name,
'image': label.image, 'image': label.image,
'imagePullPolicy': label.image_pull, 'imagePullPolicy': label.image_pull,
'command': ["/bin/bash", "-c", "--"], 'command': ["/bin/sh", "-c"],
'args': ["while true; do sleep 30; done;"], 'args': ["while true; do sleep 30; done;"],
'workingDir': '/tmp' 'workingDir': '/tmp'
}] }]

2
nodepool/driver/openshift/provider.py
View File

@ -205,7 +205,7 @@ class OpenshiftProvider(Provider):
'name': label.name, 'name': label.name,
'image': label.image, 'image': label.image,
'imagePullPolicy': label.image_pull, 'imagePullPolicy': label.image_pull,
'command': ["/bin/bash", "-c", "--"], 'command': ["/bin/sh", "-c"],
'args': ["while true; do sleep 30; done;"], 'args': ["while true; do sleep 30; done;"],
'workingDir': '/tmp', 'workingDir': '/tmp',
} }