diff --git a/doc/source/kubernetes.rst b/doc/source/kubernetes.rst index b833f2df6..79456e081 100644 --- a/doc/source/kubernetes.rst +++ b/doc/source/kubernetes.rst @@ -528,4 +528,4 @@ Selecting the kubernetes driver adds the following options to the image: ubuntu:jammy imagePullPolicy: IfNotPresent command: ["/bin/sh", "-c"] - args: ["while true; do sleep 30; done;"] + args: ["sleep infinity"] diff --git a/doc/source/openshift-pods.rst b/doc/source/openshift-pods.rst index f064bf37f..dbb725da5 100644 --- a/doc/source/openshift-pods.rst +++ b/doc/source/openshift-pods.rst @@ -458,4 +458,4 @@ Selecting the openshift pods driver adds the following options to the image: ubuntu:jammy imagePullPolicy: IfNotPresent command: ["/bin/sh", "-c"] - args: ["while true; do sleep 30; done;"] + args: ["sleep infinity"] diff --git a/doc/source/openshift.rst b/doc/source/openshift.rst index 00e9a41e9..b6202d925 100644 --- a/doc/source/openshift.rst +++ b/doc/source/openshift.rst @@ -542,4 +542,4 @@ Selecting the openshift driver adds the following options to the image: ubuntu:jammy imagePullPolicy: IfNotPresent command: ["/bin/sh", "-c"] - args: ["while true; do sleep 30; done;"] + args: ["sleep infinity"] diff --git a/nodepool/driver/kubernetes/provider.py b/nodepool/driver/kubernetes/provider.py index e0216dce6..b8200e10d 100644 --- a/nodepool/driver/kubernetes/provider.py +++ b/nodepool/driver/kubernetes/provider.py @@ -354,7 +354,7 @@ class KubernetesProvider(Provider, QuotaSupport): 'image': label.image, 'imagePullPolicy': label.image_pull, 'command': ["/bin/sh", "-c"], - 'args': ["while true; do sleep 30; done;"], + 'args': ["sleep infinity"], 'env': label.env, } diff --git a/nodepool/driver/openshift/provider.py b/nodepool/driver/openshift/provider.py index 0e77902f4..9ffc06bc6 100644 --- a/nodepool/driver/openshift/provider.py +++ b/nodepool/driver/openshift/provider.py @@ -257,7 +257,7 @@ class OpenshiftProvider(Provider, QuotaSupport): 'image': label.image, 'imagePullPolicy': label.image_pull, 'command': ["/bin/sh", "-c"], - 'args': ["while true; do sleep 30; done;"], + 'args': ["sleep infinity"], 'env': label.env, } diff --git a/nodepool/tests/fixtures/kubernetes.yaml b/nodepool/tests/fixtures/kubernetes.yaml index 2b9d10fc5..e14bddb04 100644 --- a/nodepool/tests/fixtures/kubernetes.yaml +++ b/nodepool/tests/fixtures/kubernetes.yaml @@ -62,4 +62,4 @@ providers: image: ubuntu:jammy imagePullPolicy: IfNotPresent command: ["/bin/sh", "-c"] - args: ["while true; do sleep 30; done;"] + args: ["sleep infinity"] diff --git a/nodepool/tests/fixtures/openshift.yaml b/nodepool/tests/fixtures/openshift.yaml index 26ecef8e3..9769e407e 100644 --- a/nodepool/tests/fixtures/openshift.yaml +++ b/nodepool/tests/fixtures/openshift.yaml @@ -67,4 +67,4 @@ providers: image: ubuntu:jammy imagePullPolicy: IfNotPresent command: ["/bin/sh", "-c"] - args: ["while true; do sleep 30; done;"] + args: ["sleep infinity"] diff --git a/nodepool/tests/fixtures/openshiftpods.yaml b/nodepool/tests/fixtures/openshiftpods.yaml index 7e8859a9f..3a96dc5a9 100644 --- a/nodepool/tests/fixtures/openshiftpods.yaml +++ b/nodepool/tests/fixtures/openshiftpods.yaml @@ -40,4 +40,4 @@ providers: image: ubuntu:jammy imagePullPolicy: IfNotPresent command: ["/bin/sh", "-c"] - args: ["while true; do sleep 30; done;"] + args: ["sleep infinity"] diff --git a/nodepool/tests/unit/test_driver_kubernetes.py b/nodepool/tests/unit/test_driver_kubernetes.py index ca27163f8..9792bc425 100644 --- a/nodepool/tests/unit/test_driver_kubernetes.py +++ b/nodepool/tests/unit/test_driver_kubernetes.py @@ -155,7 +155,7 @@ class TestDriverKubernetes(tests.DBTestCase): 'image': 'docker.io/fedora:28', 'imagePullPolicy': 'IfNotPresent', 'command': ['/bin/sh', '-c'], - 'args': ['while true; do sleep 30; done;'], + 'args': ['sleep infinity'], 'env': [] }], }) @@ -206,7 +206,7 @@ class TestDriverKubernetes(tests.DBTestCase): }) self.assertEqual(pod['spec'], { 'containers': [{ - 'args': ['while true; do sleep 30; done;'], + 'args': ['sleep infinity'], 'command': ['/bin/sh', '-c'], 'env': [], 'image': 'docker.io/fedora:28', @@ -655,7 +655,7 @@ class TestDriverKubernetes(tests.DBTestCase): 'image': 'ubuntu:jammy', 'imagePullPolicy': 'IfNotPresent', 'command': ['/bin/sh', '-c'], - 'args': ['while true; do sleep 30; done;'], + 'args': ['sleep infinity'], }], }) diff --git a/nodepool/tests/unit/test_driver_openshift.py b/nodepool/tests/unit/test_driver_openshift.py index 5b10f50c4..37ca8e591 100644 --- a/nodepool/tests/unit/test_driver_openshift.py +++ b/nodepool/tests/unit/test_driver_openshift.py @@ -185,7 +185,7 @@ class TestDriverOpenshift(tests.DBTestCase): 'image': 'docker.io/fedora:28', 'imagePullPolicy': 'IfNotPresent', 'command': ['/bin/sh', '-c'], - 'args': ['while true; do sleep 30; done;'], + 'args': ['sleep infinity'], 'env': [] }], 'imagePullSecrets': [], @@ -239,7 +239,7 @@ class TestDriverOpenshift(tests.DBTestCase): }) self.assertEqual(pod['spec'], { 'containers': [{ - 'args': ['while true; do sleep 30; done;'], + 'args': ['sleep infinity'], 'command': ['/bin/sh', '-c'], 'env': [], 'image': 'docker.io/fedora:28', @@ -661,7 +661,7 @@ class TestDriverOpenshift(tests.DBTestCase): 'image': 'ubuntu:jammy', 'imagePullPolicy': 'IfNotPresent', 'command': ['/bin/sh', '-c'], - 'args': ['while true; do sleep 30; done;'], + 'args': ['sleep infinity'], }], }) diff --git a/nodepool/tests/unit/test_driver_openshiftpods.py b/nodepool/tests/unit/test_driver_openshiftpods.py index 0b6fbf9ac..9437ffdbb 100644 --- a/nodepool/tests/unit/test_driver_openshiftpods.py +++ b/nodepool/tests/unit/test_driver_openshiftpods.py @@ -485,7 +485,7 @@ class TestDriverOpenshiftPods(tests.DBTestCase): 'image': 'ubuntu:jammy', 'imagePullPolicy': 'IfNotPresent', 'command': ['/bin/sh', '-c'], - 'args': ['while true; do sleep 30; done;'], + 'args': ['sleep infinity'], }], })