github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #23249 from fejta/hackcmd 

Auto commit by PR queue bot
pull/6/head
k8s-merge-robot 2016-03-22 08:07:43 -07:00
parent 88d50f30d2 4f22713add
commit e2f4141bb3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/integration/integration.go
View File

@ -388,7 +388,7 @@ func runStaticPodTest(c *client.Client, configFilePath string) {
id: static-pod-from-manifest
containers:
- name: static-container
image: kubernetes/pause`,
image: gcr.io/google_containers/pause:2.0`,
},
{
desc: "static-pod-from-spec",
@ -401,7 +401,7 @@ containers:
"spec": {
"containers": [{
"name": "static-container",
"image": "kubernetes/pause"
"image": "gcr.io/google_containers/pause:2.0"
}]
}
}`,
@ -1108,7 +1108,7 @@ const (
"containers": [
{
"name": "redis",
"image": "redis",
"image": "gcr.io/google_containers/redis:e2e",
"volumeMounts": [{
"name": "redis-data",
"mountPath": "/data"
@ -1116,7 +1116,7 @@ const (
},
{
"name": "guestbook",
"image": "google/guestbook-python-redis",
"image": "gcr.io/google_samples/gb-frontend:v3",
"ports": [{
"name": "www",
"hostPort": 80,