Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use tagged gcr.io images in cmd/integration/integration.go #23249

Merged
merged 1 commit into from
Mar 22, 2016
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions cmd/integration/integration.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -401,7 +401,7 @@ containers:
"spec": {
"containers": [{
"name": "static-container",
"image": "kubernetes/pause"
"image": "gcr.io/google_containers/pause:2.0"
}]
}
}`,
Expand Down Expand Up @@ -1108,15 +1108,15 @@ const (
"containers": [
{
"name": "redis",
"image": "redis",
"image": "gcr.io/google_containers/redis:e2e",
"volumeMounts": [{
"name": "redis-data",
"mountPath": "/data"
}]
},
{
"name": "guestbook",
"image": "google/guestbook-python-redis",
"image": "gcr.io/google_samples/gb-frontend:v3",
"ports": [{
"name": "www",
"hostPort": 80,
Expand Down