zuul/nodepool
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Zuul 2020-03-18 20:46:53 +00:00 committed by Gerrit Code Review
commit c0d7c96f76
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',
} }