Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
4ba39b47
Commit
4ba39b47
authored
Aug 31, 2016
by
Avesh Agarwal
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update mounttest container image version to 0.7 everywhere.
parent
34f7345d
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
15 additions
and
17 deletions
+15
-17
e2e-image-puller.manifest
.../saltbase/salt/e2e-image-puller/e2e-image-puller.manifest
+1
-1
configmap.go
test/e2e/common/configmap.go
+2
-2
downwardapi_volume.go
test/e2e/common/downwardapi_volume.go
+4
-4
empty_dir.go
test/e2e/common/empty_dir.go
+1
-1
host_path.go
test/e2e/common/host_path.go
+2
-2
service_accounts.go
test/e2e/service_accounts.go
+3
-3
image_list.go
test/e2e_node/image_list.go
+0
-2
secret-pod.yaml
test/fixtures/doc-yaml/user-guide/secrets/secret-pod.yaml
+1
-1
Dockerfile
test/images/mount-tester-user/Dockerfile
+1
-1
No files found.
cluster/saltbase/salt/e2e-image-puller/e2e-image-puller.manifest
View file @
4ba39b47
...
...
@@ -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:
...
...
test/e2e/common/configmap.go
View file @
4ba39b47
...
...
@@ -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
{
{
...
...
test/e2e/common/downwardapi_volume.go
View file @
4ba39b47
...
...
@@ -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
{
{
...
...
test/e2e/common/empty_dir.go
View file @
4ba39b47
...
...
@@ -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"
)
...
...
test/e2e/common/host_path.go
View file @
4ba39b47
...
...
@@ -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
,
...
...
test/e2e/service_accounts.go
View file @
4ba39b47
...
...
@@ -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
),
},
...
...
test/e2e_node/image_list.go
View file @
4ba39b47
...
...
@@ -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"
,
...
...
test/fixtures/doc-yaml/user-guide/secrets/secret-pod.yaml
View file @
4ba39b47
...
...
@@ -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
...
...
test/images/mount-tester-user/Dockerfile
View file @
4ba39b47
...
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment