github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-08 11:38:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9884 from brendandburns/gcr

Browse Source 
Switch to loading busybox from gcr.
This commit is contained in:
Saad Ali 2015-06-17 11:38:24 -07:00
commit 56083489e3
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hack/e2e-suite/services.sh
View File

@ -280,8 +280,8 @@ function verify_from_container() {
echo "waiting for $1 at $2:$3" echo "waiting for $1 at $2:$3"
results=($(ssh-to-node "${test_node}" " results=($(ssh-to-node "${test_node}" "
set -e; set -e;
sudo docker pull busybox >/dev/null; sudo docker pull gcr.io/google_containers/busybox >/dev/null;
sudo docker run busybox sh -c ' sudo docker run gcr.io/google_containers/busybox sh -c '
for i in $(seq -s' ' 1 $(($4*3))); do for i in $(seq -s' ' 1 $(($4*3))); do
if wget -q -T 3 -O - http://$2:$3; then if wget -q -T 3 -O - http://$2:$3; then
echo echo

2
test/e2e/persistent_volumes.go
View File

@ -172,7 +172,7 @@ func makeCheckPod(ns string, nfsserver string) *api.Pod {
Containers: []api.Container{ Containers: []api.Container{
{ {
Name: "scrub-checker", Name: "scrub-checker",
Image: "busybox", Image: "gcr.io/google_containers/busybox",
Command: []string{"/bin/sh"}, Command: []string{"/bin/sh"},
Args: []string{"-c", "test ! -e /mnt/index.html || exit 1"}, Args: []string{"-c", "test ! -e /mnt/index.html || exit 1"},
VolumeMounts: []api.VolumeMount{ VolumeMounts: []api.VolumeMount{

2
test/e2e/pre_stop.go
View File

@ -76,7 +76,7 @@ func testPreStop(c *client.Client, ns string) {
Containers: []api.Container{ Containers: []api.Container{
{ {
Name: "tester", Name: "tester",
Image: "busybox", Image: "gcr.io/google_containers/busybox",
Command: []string{"sleep", "600"}, Command: []string{"sleep", "600"},
Lifecycle: &api.Lifecycle{ Lifecycle: &api.Lifecycle{
PreStop: &api.Handler{ PreStop: &api.Handler{