diff --git a/cluster/saltbase/salt/e2e-image-puller/e2e-image-puller.manifest b/cluster/saltbase/salt/e2e-image-puller/e2e-image-puller.manifest index 8b9ef7fda3..b0c2104b91 100644 --- a/cluster/saltbase/salt/e2e-image-puller/e2e-image-puller.manifest +++ b/cluster/saltbase/salt/e2e-image-puller/e2e-image-puller.manifest @@ -27,7 +27,7 @@ spec: command: - /bin/sh - -c - - "for i in gcr.io/google_containers/busybox gcr.io/google_containers/busybox:1.24 gcr.io/google_containers/dnsutils:e2e gcr.io/google_containers/eptest:0.1 gcr.io/google_containers/fakegitserver:0.1 gcr.io/google_containers/hostexec:1.2 gcr.io/google_containers/iperf:e2e gcr.io/google_containers/jessie-dnsutils:e2e gcr.io/google_containers/liveness:e2e gcr.io/google_containers/mounttest:0.2 gcr.io/google_containers/mounttest:0.5 gcr.io/google_containers/mounttest:0.6 gcr.io/google_containers/mounttest-user:0.3 gcr.io/google_containers/netexec:1.4 gcr.io/google_containers/netexec:1.5 gcr.io/google_containers/nettest:1.7 gcr.io/google_containers/nettest:1.8 gcr.io/google_containers/nginx-slim:0.7 gcr.io/google_containers/n-way-http:1.0 gcr.io/google_containers/pause:2.0 gcr.io/google_containers/pause-amd64:3.0 gcr.io/google_containers/porter:cd5cb5791ebaa8641955f0e8c2a9bed669b1eaab gcr.io/google_containers/portforwardtester:1.0 gcr.io/google_containers/redis:e2e gcr.io/google_containers/resource_consumer:beta4 gcr.io/google_containers/resource_consumer/controller:beta4 gcr.io/google_containers/serve_hostname:v1.4 gcr.io/google_containers/test-webserver:e2e gcr.io/google_containers/ubuntu:14.04 gcr.io/google_containers/update-demo:kitten gcr.io/google_containers/update-demo:nautilus gcr.io/google_containers/volume-ceph:0.1 gcr.io/google_containers/volume-gluster:0.2 gcr.io/google_containers/volume-iscsi:0.1 gcr.io/google_containers/volume-nfs:0.6 gcr.io/google_containers/volume-rbd:0.1 gcr.io/google_samples/gb-redisslave:v1 gcr.io/google_containers/redis:v1; do echo $(date '+%X') pulling $i; docker pull $i 1>/dev/null; done; exit 0;" + - "for i in gcr.io/google_containers/busybox gcr.io/google_containers/busybox:1.24 gcr.io/google_containers/dnsutils:e2e gcr.io/google_containers/eptest:0.1 gcr.io/google_containers/fakegitserver:0.1 gcr.io/google_containers/hostexec:1.2 gcr.io/google_containers/iperf:e2e gcr.io/google_containers/jessie-dnsutils:e2e gcr.io/google_containers/liveness:e2e gcr.io/google_containers/mounttest:0.7 gcr.io/google_containers/mounttest-user:0.3 gcr.io/google_containers/netexec:1.4 gcr.io/google_containers/netexec:1.5 gcr.io/google_containers/nettest:1.7 gcr.io/google_containers/nettest:1.8 gcr.io/google_containers/nginx-slim:0.7 gcr.io/google_containers/n-way-http:1.0 gcr.io/google_containers/pause:2.0 gcr.io/google_containers/pause-amd64:3.0 gcr.io/google_containers/porter:cd5cb5791ebaa8641955f0e8c2a9bed669b1eaab gcr.io/google_containers/portforwardtester:1.0 gcr.io/google_containers/redis:e2e gcr.io/google_containers/resource_consumer:beta4 gcr.io/google_containers/resource_consumer/controller:beta4 gcr.io/google_containers/serve_hostname:v1.4 gcr.io/google_containers/test-webserver:e2e gcr.io/google_containers/ubuntu:14.04 gcr.io/google_containers/update-demo:kitten gcr.io/google_containers/update-demo:nautilus gcr.io/google_containers/volume-ceph:0.1 gcr.io/google_containers/volume-gluster:0.2 gcr.io/google_containers/volume-iscsi:0.1 gcr.io/google_containers/volume-nfs:0.6 gcr.io/google_containers/volume-rbd:0.1 gcr.io/google_samples/gb-redisslave:v1 gcr.io/google_containers/redis:v1; do echo $(date '+%X') pulling $i; docker pull $i 1>/dev/null; done; exit 0;" securityContext: privileged: true volumeMounts: diff --git a/test/e2e/common/configmap.go b/test/e2e/common/configmap.go index b0cabaf69a..fe2d2fdaac 100644 --- a/test/e2e/common/configmap.go +++ b/test/e2e/common/configmap.go @@ -121,7 +121,7 @@ var _ = framework.KubeDescribe("ConfigMap", func() { Containers: []api.Container{ { Name: containerName, - Image: "gcr.io/google_containers/mounttest:0.6", + Image: "gcr.io/google_containers/mounttest:0.7", Command: []string{"/mt", "--break_on_expected_content=false", "--retry_time=120", "--file_content_in_loop=/etc/configmap-volume/data-1"}, VolumeMounts: []api.VolumeMount{ { @@ -260,7 +260,7 @@ var _ = framework.KubeDescribe("ConfigMap", func() { Containers: []api.Container{ { Name: "configmap-volume-test", - Image: "gcr.io/google_containers/mounttest:0.6", + Image: "gcr.io/google_containers/mounttest:0.7", Args: []string{"--file_content=/etc/configmap-volume/data-1"}, VolumeMounts: []api.VolumeMount{ { diff --git a/test/e2e/common/downwardapi_volume.go b/test/e2e/common/downwardapi_volume.go index cdc72aae0f..02499b836c 100644 --- a/test/e2e/common/downwardapi_volume.go +++ b/test/e2e/common/downwardapi_volume.go @@ -231,7 +231,7 @@ func downwardAPIVolumePodForSimpleTest(name string, filePath string) *api.Pod { pod.Spec.Containers = []api.Container{ { Name: "client-container", - Image: "gcr.io/google_containers/mounttest:0.6", + Image: "gcr.io/google_containers/mounttest:0.7", Command: []string{"/mt", "--file_content=" + filePath}, VolumeMounts: []api.VolumeMount{ { @@ -262,7 +262,7 @@ func downwardAPIVolumeBaseContainers(name, filePath string) []api.Container { return []api.Container{ { Name: name, - Image: "gcr.io/google_containers/mounttest:0.6", + Image: "gcr.io/google_containers/mounttest:0.7", Command: []string{"/mt", "--file_content=" + filePath}, Resources: api.ResourceRequirements{ Requests: api.ResourceList{ @@ -290,7 +290,7 @@ func downwardAPIVolumeDefaultBaseContainer(name, filePath string) []api.Containe return []api.Container{ { Name: name, - Image: "gcr.io/google_containers/mounttest:0.6", + Image: "gcr.io/google_containers/mounttest:0.7", Command: []string{"/mt", "--file_content=" + filePath}, VolumeMounts: []api.VolumeMount{ { @@ -309,7 +309,7 @@ func downwardAPIVolumePodForUpdateTest(name string, labels, annotations map[stri pod.Spec.Containers = []api.Container{ { Name: "client-container", - Image: "gcr.io/google_containers/mounttest:0.6", + Image: "gcr.io/google_containers/mounttest:0.7", Command: []string{"/mt", "--break_on_expected_content=false", "--retry_time=120", "--file_content_in_loop=" + filePath}, VolumeMounts: []api.VolumeMount{ { diff --git a/test/e2e/common/empty_dir.go b/test/e2e/common/empty_dir.go index 469bd517bc..f9bd314b0b 100644 --- a/test/e2e/common/empty_dir.go +++ b/test/e2e/common/empty_dir.go @@ -30,7 +30,7 @@ import ( ) const ( - testImageRootUid = "gcr.io/google_containers/mounttest:0.5" + testImageRootUid = "gcr.io/google_containers/mounttest:0.7" testImageNonRootUid = "gcr.io/google_containers/mounttest-user:0.3" ) diff --git a/test/e2e/common/host_path.go b/test/e2e/common/host_path.go index 17f44edf2d..558febec68 100644 --- a/test/e2e/common/host_path.go +++ b/test/e2e/common/host_path.go @@ -145,7 +145,7 @@ func testPodWithHostVol(path string, source *api.HostPathVolumeSource) *api.Pod Containers: []api.Container{ { Name: containerName1, - Image: "gcr.io/google_containers/mounttest:0.6", + Image: "gcr.io/google_containers/mounttest:0.7", VolumeMounts: []api.VolumeMount{ { Name: volumeName, @@ -155,7 +155,7 @@ func testPodWithHostVol(path string, source *api.HostPathVolumeSource) *api.Pod }, { Name: containerName2, - Image: "gcr.io/google_containers/mounttest:0.6", + Image: "gcr.io/google_containers/mounttest:0.7", VolumeMounts: []api.VolumeMount{ { Name: volumeName, diff --git a/test/e2e/service_accounts.go b/test/e2e/service_accounts.go index d006b7cf73..3d9708a08f 100644 --- a/test/e2e/service_accounts.go +++ b/test/e2e/service_accounts.go @@ -197,14 +197,14 @@ var _ = framework.KubeDescribe("ServiceAccounts", func() { Containers: []api.Container{ { Name: "token-test", - Image: "gcr.io/google_containers/mounttest:0.2", + Image: "gcr.io/google_containers/mounttest:0.7", Args: []string{ fmt.Sprintf("--file_content=%s/%s", serviceaccount.DefaultAPITokenMountPath, api.ServiceAccountTokenKey), }, }, { Name: "root-ca-test", - Image: "gcr.io/google_containers/mounttest:0.2", + Image: "gcr.io/google_containers/mounttest:0.7", Args: []string{ fmt.Sprintf("--file_content=%s/%s", serviceaccount.DefaultAPITokenMountPath, api.ServiceAccountRootCAKey), }, @@ -218,7 +218,7 @@ var _ = framework.KubeDescribe("ServiceAccounts", func() { if supportsTokenNamespace { pod.Spec.Containers = append(pod.Spec.Containers, api.Container{ Name: "namespace-test", - Image: "gcr.io/google_containers/mounttest:0.2", + Image: "gcr.io/google_containers/mounttest:0.7", Args: []string{ fmt.Sprintf("--file_content=%s/%s", serviceaccount.DefaultAPITokenMountPath, api.ServiceAccountNamespaceKey), }, diff --git a/test/e2e_node/image_list.go b/test/e2e_node/image_list.go index fd9341f30e..758b542ca7 100644 --- a/test/e2e_node/image_list.go +++ b/test/e2e_node/image_list.go @@ -58,8 +58,6 @@ var ImageRegistry = map[int]string{ epTestImage: "gcr.io/google_containers/eptest:0.1", hostExecImage: "gcr.io/google_containers/hostexec:1.2", livenessImage: "gcr.io/google_containers/liveness:e2e", - mountTestImage5: "gcr.io/google_containers/mounttest:0.5", - mountTestImage6: "gcr.io/google_containers/mounttest:0.6", mountTestImage7: "gcr.io/google_containers/mounttest:0.7", mountTestUserImage: "gcr.io/google_containers/mounttest-user:0.3", netExecImage: "gcr.io/google_containers/netexec:1.4", diff --git a/test/fixtures/doc-yaml/user-guide/secrets/secret-pod.yaml b/test/fixtures/doc-yaml/user-guide/secrets/secret-pod.yaml index f5b73a01ed..323c735067 100644 --- a/test/fixtures/doc-yaml/user-guide/secrets/secret-pod.yaml +++ b/test/fixtures/doc-yaml/user-guide/secrets/secret-pod.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: test-container - image: kubernetes/mounttest:0.1 + image: gcr.io/google_containers/mounttest:0.7 command: [ "/mt", "--file_content=/etc/secret-volume/data-1" ] volumeMounts: # name must match the volume name below diff --git a/test/images/mount-tester-user/Dockerfile b/test/images/mount-tester-user/Dockerfile index 6d974c0ac0..4634295510 100644 --- a/test/images/mount-tester-user/Dockerfile +++ b/test/images/mount-tester-user/Dockerfile @@ -12,5 +12,5 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM gcr.io/google_containers/mounttest:0.6 +FROM gcr.io/google_containers/mounttest:0.7 USER 1001