Merge pull request #23955 from fejta/pkg-validation

Automatic merge from submit-queue

Use tagged gcr.io redis image for pkg/api tests

Migrate pkg/api/validation/testdata redis images to use tagged gcr.io version for https://github.com/kubernetes/kubernetes/issues/13288 and https://github.com/kubernetes/kubernetes/issues/20836
This commit is contained in:
k8s-merge-robot
2016-04-19 16:37:13 -07:00
5 changed files with 5 additions and 5 deletions

View File

@@ -7,5 +7,5 @@ metadata:
spec: spec:
containers: containers:
- args: "this is a bad command" - args: "this is a bad command"
image: redis image: gcr.io/fake_project/fake_image:fake_tag
name: master name: master

View File

@@ -11,7 +11,7 @@
"containers": [ "containers": [
{ {
"name": "master", "name": "master",
"image": "redis", "image": "gcr.io/fake_project/fake_image:fake_tag",
"args": "this is a bad command" "args": "this is a bad command"
} }
] ]

View File

@@ -14,7 +14,7 @@
"containers": [ "containers": [
{ {
"name": "apache-php", "name": "apache-php",
"image": "php:5.6.2-apache", "image": "gcr.io/fake_project/fake_image:fake_tag",
"ports": [ "ports": [
{ {
"name": "apache", "name": "apache",

View File

@@ -14,7 +14,7 @@
"containers": [ "containers": [
{ {
"name": "apache-php", "name": "apache-php",
"image": "php:5.6.2-apache", "image": "gcr.io/fake_project/fake_image:fake_tag",
"ports": [ "ports": [
{ {
"name": "apache", "name": "apache",

View File

@@ -12,5 +12,5 @@ spec:
- an - an
- ok - ok
- command - command
image: redis image: gcr.io/fake_project/fake_image:fake_tag
name: master name: master