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 cfeed5a8ff3a0..2bda14166f38b 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.7 gcr.io/google_containers/mounttest-user:0.3 gcr.io/google_containers/netexec:1.4 gcr.io/google_containers/netexec:1.7 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/nginx-slim:0.8 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.2 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.8 gcr.io/google_containers/mounttest-user:0.5 gcr.io/google_containers/netexec:1.4 gcr.io/google_containers/netexec:1.7 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/nginx-slim:0.8 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.2 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/pkg/volume/util/operationexecutor/operation_executor_test.go b/pkg/volume/util/operationexecutor/operation_executor_test.go index 5592ba668ed11..e99328736679d 100644 --- a/pkg/volume/util/operationexecutor/operation_executor_test.go +++ b/pkg/volume/util/operationexecutor/operation_executor_test.go @@ -301,7 +301,7 @@ func getTestPodWithSecret(podName, secretName string) *v1.Pod { Containers: []v1.Container{ { Name: "secret-volume-test", - Image: "gcr.io/google_containers/mounttest:0.7", + Image: "gcr.io/google_containers/mounttest:0.8", Args: []string{ "--file_content=/etc/secret-volume/data-1", "--file_mode=/etc/secret-volume/data-1"}, @@ -340,7 +340,7 @@ func getTestPodWithGCEPD(podName, pdName string) *v1.Pod { Containers: []v1.Container{ { Name: "pd-volume-test", - Image: "gcr.io/google_containers/mounttest:0.7", + Image: "gcr.io/google_containers/mounttest:0.8", Args: []string{ "--file_content=/etc/pd-volume/data-1", }, diff --git a/test/e2e/common/configmap.go b/test/e2e/common/configmap.go index 6530372bf9aac..1580157c5a3bb 100644 --- a/test/e2e/common/configmap.go +++ b/test/e2e/common/configmap.go @@ -122,7 +122,7 @@ var _ = framework.KubeDescribe("ConfigMap", func() { Containers: []v1.Container{ { Name: containerName, - Image: "gcr.io/google_containers/mounttest:0.7", + Image: "gcr.io/google_containers/mounttest:0.8", Command: []string{"/mt", "--break_on_expected_content=false", "--retry_time=120", "--file_content_in_loop=/etc/configmap-volume/data-1"}, VolumeMounts: []v1.VolumeMount{ { @@ -259,7 +259,7 @@ var _ = framework.KubeDescribe("ConfigMap", func() { Containers: []v1.Container{ { Name: deleteContainerName, - Image: "gcr.io/google_containers/mounttest:0.7", + Image: "gcr.io/google_containers/mounttest:0.8", Command: []string{"/mt", "--break_on_expected_content=false", "--retry_time=120", "--file_content_in_loop=/etc/configmap-volumes/delete/data-1"}, VolumeMounts: []v1.VolumeMount{ { @@ -271,7 +271,7 @@ var _ = framework.KubeDescribe("ConfigMap", func() { }, { Name: updateContainerName, - Image: "gcr.io/google_containers/mounttest:0.7", + Image: "gcr.io/google_containers/mounttest:0.8", Command: []string{"/mt", "--break_on_expected_content=false", "--retry_time=120", "--file_content_in_loop=/etc/configmap-volumes/update/data-3"}, VolumeMounts: []v1.VolumeMount{ { @@ -283,7 +283,7 @@ var _ = framework.KubeDescribe("ConfigMap", func() { }, { Name: createContainerName, - Image: "gcr.io/google_containers/mounttest:0.7", + Image: "gcr.io/google_containers/mounttest:0.8", Command: []string{"/mt", "--break_on_expected_content=false", "--retry_time=120", "--file_content_in_loop=/etc/configmap-volumes/create/data-1"}, VolumeMounts: []v1.VolumeMount{ { @@ -467,7 +467,7 @@ var _ = framework.KubeDescribe("ConfigMap", func() { Containers: []v1.Container{ { Name: "configmap-volume-test", - Image: "gcr.io/google_containers/mounttest:0.7", + Image: "gcr.io/google_containers/mounttest:0.8", Args: []string{"--file_content=/etc/configmap-volume/data-1"}, VolumeMounts: []v1.VolumeMount{ { @@ -557,7 +557,7 @@ func doConfigMapE2EWithoutMappings(f *framework.Framework, uid, fsGroup int64, d Containers: []v1.Container{ { Name: "configmap-volume-test", - Image: "gcr.io/google_containers/mounttest:0.7", + Image: "gcr.io/google_containers/mounttest:0.8", Args: []string{ "--file_content=/etc/configmap-volume/data-1", "--file_mode=/etc/configmap-volume/data-1"}, @@ -637,7 +637,7 @@ func doConfigMapE2EWithMappings(f *framework.Framework, uid, fsGroup int64, item Containers: []v1.Container{ { Name: "configmap-volume-test", - Image: "gcr.io/google_containers/mounttest:0.7", + Image: "gcr.io/google_containers/mounttest:0.8", Args: []string{"--file_content=/etc/configmap-volume/path/to/data-2", "--file_mode=/etc/configmap-volume/path/to/data-2"}, VolumeMounts: []v1.VolumeMount{ diff --git a/test/e2e/common/downwardapi_volume.go b/test/e2e/common/downwardapi_volume.go index 06bfd08549d92..2e85ccd64d7bd 100644 --- a/test/e2e/common/downwardapi_volume.go +++ b/test/e2e/common/downwardapi_volume.go @@ -211,7 +211,7 @@ func downwardAPIVolumePodForModeTest(name, filePath string, itemMode, defaultMod pod.Spec.Containers = []v1.Container{ { Name: "client-container", - Image: "gcr.io/google_containers/mounttest:0.7", + Image: "gcr.io/google_containers/mounttest:0.8", Command: []string{"/mt", "--file_mode=" + filePath}, VolumeMounts: []v1.VolumeMount{ { @@ -237,7 +237,7 @@ func downwardAPIVolumePodForSimpleTest(name string, filePath string) *v1.Pod { pod.Spec.Containers = []v1.Container{ { Name: "client-container", - Image: "gcr.io/google_containers/mounttest:0.7", + Image: "gcr.io/google_containers/mounttest:0.8", Command: []string{"/mt", "--file_content=" + filePath}, VolumeMounts: []v1.VolumeMount{ { @@ -268,7 +268,7 @@ func downwardAPIVolumeBaseContainers(name, filePath string) []v1.Container { return []v1.Container{ { Name: name, - Image: "gcr.io/google_containers/mounttest:0.7", + Image: "gcr.io/google_containers/mounttest:0.8", Command: []string{"/mt", "--file_content=" + filePath}, Resources: v1.ResourceRequirements{ Requests: v1.ResourceList{ @@ -296,7 +296,7 @@ func downwardAPIVolumeDefaultBaseContainer(name, filePath string) []v1.Container return []v1.Container{ { Name: name, - Image: "gcr.io/google_containers/mounttest:0.7", + Image: "gcr.io/google_containers/mounttest:0.8", Command: []string{"/mt", "--file_content=" + filePath}, VolumeMounts: []v1.VolumeMount{ { @@ -315,7 +315,7 @@ func downwardAPIVolumePodForUpdateTest(name string, labels, annotations map[stri pod.Spec.Containers = []v1.Container{ { Name: "client-container", - Image: "gcr.io/google_containers/mounttest:0.7", + Image: "gcr.io/google_containers/mounttest:0.8", Command: []string{"/mt", "--break_on_expected_content=false", "--retry_time=120", "--file_content_in_loop=" + filePath}, VolumeMounts: []v1.VolumeMount{ { diff --git a/test/e2e/common/empty_dir.go b/test/e2e/common/empty_dir.go index 4f8ecb1e7c49d..7b358849bb7ac 100644 --- a/test/e2e/common/empty_dir.go +++ b/test/e2e/common/empty_dir.go @@ -30,8 +30,8 @@ import ( ) const ( - testImageRootUid = "gcr.io/google_containers/mounttest:0.7" - testImageNonRootUid = "gcr.io/google_containers/mounttest-user:0.3" + testImageRootUid = "gcr.io/google_containers/mounttest:0.8" + testImageNonRootUid = "gcr.io/google_containers/mounttest-user:0.5" ) var _ = framework.KubeDescribe("EmptyDir volumes", func() { diff --git a/test/e2e/common/host_path.go b/test/e2e/common/host_path.go index 24b93c196b619..e57a6e9abb048 100644 --- a/test/e2e/common/host_path.go +++ b/test/e2e/common/host_path.go @@ -146,7 +146,7 @@ func testPodWithHostVol(path string, source *v1.HostPathVolumeSource) *v1.Pod { Containers: []v1.Container{ { Name: containerName1, - Image: "gcr.io/google_containers/mounttest:0.7", + Image: "gcr.io/google_containers/mounttest:0.8", VolumeMounts: []v1.VolumeMount{ { Name: volumeName, @@ -159,7 +159,7 @@ func testPodWithHostVol(path string, source *v1.HostPathVolumeSource) *v1.Pod { }, { Name: containerName2, - Image: "gcr.io/google_containers/mounttest:0.7", + Image: "gcr.io/google_containers/mounttest:0.8", VolumeMounts: []v1.VolumeMount{ { Name: volumeName, diff --git a/test/e2e/common/secrets.go b/test/e2e/common/secrets.go index 7d488f039eebf..0fe8d5bc34e4d 100644 --- a/test/e2e/common/secrets.go +++ b/test/e2e/common/secrets.go @@ -125,7 +125,7 @@ var _ = framework.KubeDescribe("Secrets", func() { Containers: []v1.Container{ { Name: "secret-volume-test", - Image: "gcr.io/google_containers/mounttest:0.7", + Image: "gcr.io/google_containers/mounttest:0.8", Args: []string{ "--file_content=/etc/secret-volume/data-1", "--file_mode=/etc/secret-volume/data-1"}, @@ -251,7 +251,7 @@ var _ = framework.KubeDescribe("Secrets", func() { Containers: []v1.Container{ { Name: deleteContainerName, - Image: "gcr.io/google_containers/mounttest:0.7", + Image: "gcr.io/google_containers/mounttest:0.8", Command: []string{"/mt", "--break_on_expected_content=false", "--retry_time=120", "--file_content_in_loop=/etc/secret-volumes/delete/data-1"}, VolumeMounts: []v1.VolumeMount{ { @@ -263,7 +263,7 @@ var _ = framework.KubeDescribe("Secrets", func() { }, { Name: updateContainerName, - Image: "gcr.io/google_containers/mounttest:0.7", + Image: "gcr.io/google_containers/mounttest:0.8", Command: []string{"/mt", "--break_on_expected_content=false", "--retry_time=120", "--file_content_in_loop=/etc/secret-volumes/update/data-3"}, VolumeMounts: []v1.VolumeMount{ { @@ -275,7 +275,7 @@ var _ = framework.KubeDescribe("Secrets", func() { }, { Name: createContainerName, - Image: "gcr.io/google_containers/mounttest:0.7", + Image: "gcr.io/google_containers/mounttest:0.8", Command: []string{"/mt", "--break_on_expected_content=false", "--retry_time=120", "--file_content_in_loop=/etc/secret-volumes/create/data-1"}, VolumeMounts: []v1.VolumeMount{ { @@ -475,7 +475,7 @@ func doSecretE2EWithoutMapping(f *framework.Framework, defaultMode *int32, secre Containers: []v1.Container{ { Name: "secret-volume-test", - Image: "gcr.io/google_containers/mounttest:0.7", + Image: "gcr.io/google_containers/mounttest:0.8", Args: []string{ "--file_content=/etc/secret-volume/data-1", "--file_mode=/etc/secret-volume/data-1"}, @@ -552,7 +552,7 @@ func doSecretE2EWithMapping(f *framework.Framework, mode *int32) { Containers: []v1.Container{ { Name: "secret-volume-test", - Image: "gcr.io/google_containers/mounttest:0.7", + Image: "gcr.io/google_containers/mounttest:0.8", Args: []string{ "--file_content=/etc/secret-volume/new-path-data-1", "--file_mode=/etc/secret-volume/new-path-data-1"}, diff --git a/test/e2e/common/util.go b/test/e2e/common/util.go index e687067c279cf..508609e74be40 100644 --- a/test/e2e/common/util.go +++ b/test/e2e/common/util.go @@ -38,8 +38,8 @@ var CommonImageWhiteList = sets.NewString( "gcr.io/google_containers/busybox:1.24", "gcr.io/google_containers/eptest:0.1", "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/mounttest:0.8", + "gcr.io/google_containers/mounttest-user:0.5", "gcr.io/google_containers/netexec:1.4", "gcr.io/google_containers/netexec:1.5", "gcr.io/google_containers/nginx-slim:0.7", diff --git a/test/e2e/service_accounts.go b/test/e2e/service_accounts.go index be4f16445fcb6..9c6d7c0dd7979 100644 --- a/test/e2e/service_accounts.go +++ b/test/e2e/service_accounts.go @@ -198,14 +198,14 @@ var _ = framework.KubeDescribe("ServiceAccounts", func() { Containers: []v1.Container{ { Name: "token-test", - Image: "gcr.io/google_containers/mounttest:0.7", + Image: "gcr.io/google_containers/mounttest:0.8", Args: []string{ fmt.Sprintf("--file_content=%s/%s", serviceaccount.DefaultAPITokenMountPath, v1.ServiceAccountTokenKey), }, }, { Name: "root-ca-test", - Image: "gcr.io/google_containers/mounttest:0.7", + Image: "gcr.io/google_containers/mounttest:0.8", Args: []string{ fmt.Sprintf("--file_content=%s/%s", serviceaccount.DefaultAPITokenMountPath, v1.ServiceAccountRootCAKey), }, @@ -219,7 +219,7 @@ var _ = framework.KubeDescribe("ServiceAccounts", func() { if supportsTokenNamespace { pod.Spec.Containers = append(pod.Spec.Containers, v1.Container{ Name: "namespace-test", - Image: "gcr.io/google_containers/mounttest:0.7", + Image: "gcr.io/google_containers/mounttest:0.8", Args: []string{ fmt.Sprintf("--file_content=%s/%s", serviceaccount.DefaultAPITokenMountPath, v1.ServiceAccountNamespaceKey), }, 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 323c735067bcc..8f87a8dea5e07 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: gcr.io/google_containers/mounttest:0.7 + image: gcr.io/google_containers/mounttest:0.8 command: [ "/mt", "--file_content=/etc/secret-volume/data-1" ] volumeMounts: # name must match the volume name below