From 5fd47873dda941f32b75a118d9357f5e0dbcecef Mon Sep 17 00:00:00 2001
From: Erick Fejta <fejta@google.com>
Date: Wed, 6 Apr 2016 17:14:48 -0700
Subject: [PATCH] Update hack/test-cmd.sh to use tagged, gcr.io images

---
 hack/test-cmd.sh                              | 27 +++++++++++--------
 hack/testdata/deployment-revision1.yaml       | 21 +++++++++++++++
 hack/testdata/deployment-revision2.yaml       |  4 +--
 hack/testdata/multi-resource-json-modify.json |  2 +-
 hack/testdata/multi-resource-json.json        |  2 +-
 hack/testdata/multi-resource-list-modify.json |  2 +-
 hack/testdata/multi-resource-list.json        |  2 +-
 .../multi-resource-rclist-modify.json         |  4 +--
 hack/testdata/multi-resource-rclist.json      |  4 +--
 hack/testdata/multi-resource-yaml-modify.yaml |  4 +--
 hack/testdata/multi-resource-yaml.yaml        |  4 +--
 hack/testdata/pod-apply.yaml                  |  2 +-
 hack/testdata/pod-with-large-name.yaml        |  2 +-
 hack/testdata/pod.yaml                        |  2 +-
 14 files changed, 54 insertions(+), 28 deletions(-)
 create mode 100644 hack/testdata/deployment-revision1.yaml

diff --git a/hack/test-cmd.sh b/hack/test-cmd.sh
index 81fe0e9cf0a..448c96f08e6 100755
--- a/hack/test-cmd.sh
+++ b/hack/test-cmd.sh
@@ -136,6 +136,11 @@ KUBELET_HEALTHZ_PORT=${KUBELET_HEALTHZ_PORT:-10248}
 CTLRMGR_PORT=${CTLRMGR_PORT:-10252}
 PROXY_HOST=127.0.0.1 # kubectl only serves on localhost.
 
+IMAGE_NGINX="gcr.io/google-containers/nginx:1.7.9"
+IMAGE_DEPLOYMENT_R1="gcr.io/google-containers/nginx:test-cmd"  # deployment-revision1.yaml
+IMAGE_DEPLOYMENT_R2="$IMAGE_NGINX"  # deployment-revision2.yaml
+IMAGE_PERL="gcr.io/google-containers/perl"
+
 # ensure ~/.kube/config isn't loaded by tests
 HOME="${KUBE_TEMP}"
 
@@ -708,7 +713,7 @@ __EOF__
   # Pre-Condition: no RC exists
   kube::test::get_object_assert rc "{{range.items}}{{$id_field}}:{{end}}" ''
   # Command: create the rc "nginx" with image nginx
-  kubectl run nginx --image=nginx --save-config --generator=run/v1 "${kube_flags[@]}"
+  kubectl run nginx "--image=$IMAGE_NGINX" --save-config --generator=run/v1 "${kube_flags[@]}"
   # Post-Condition: rc "nginx" has configuration annotation
   [[ "$(kubectl get rc nginx -o yaml "${kube_flags[@]}" | grep kubectl.kubernetes.io/last-applied-configuration)" ]]
   ## 5. kubectl expose --save-config should generate configuration annotation
@@ -757,13 +762,13 @@ __EOF__
   # Pre-Condition: no Job exists
   kube::test::get_object_assert jobs "{{range.items}}{{$id_field}}:{{end}}" ''
   # Command
-  kubectl run pi --generator=job/v1beta1 --image=perl --restart=OnFailure -- perl -Mbignum=bpi -wle 'print bpi(20)' "${kube_flags[@]}"
+  kubectl run pi --generator=job/v1beta1 "--image=$IMAGE_PERL" --restart=OnFailure -- perl -Mbignum=bpi -wle 'print bpi(20)' "${kube_flags[@]}"
   # Post-Condition: Job "pi" is created
   kube::test::get_object_assert jobs "{{range.items}}{{$id_field}}:{{end}}" 'pi:'
   # Clean up
   kubectl delete jobs pi "${kube_flags[@]}"
   # Command
-  kubectl run pi --generator=job/v1 --image=perl --restart=OnFailure -- perl -Mbignum=bpi -wle 'print bpi(20)' "${kube_flags[@]}"
+  kubectl run pi --generator=job/v1 "--image=$IMAGE_PERL" --restart=OnFailure -- perl -Mbignum=bpi -wle 'print bpi(20)' "${kube_flags[@]}"
   # Post-Condition: Job "pi" is created
   kube::test::get_object_assert jobs "{{range.items}}{{$id_field}}:{{end}}" 'pi:'
   # Clean up
@@ -773,7 +778,7 @@ __EOF__
   # Pre-Condition: no Deployment exists
   kube::test::get_object_assert deployment "{{range.items}}{{$id_field}}:{{end}}" ''
   # Command
-  kubectl run nginx --image=nginx --generator=deployment/v1beta1 "${kube_flags[@]}"
+  kubectl run nginx "--image=$IMAGE_NGINX" --generator=deployment/v1beta1 "${kube_flags[@]}"
   # Post-Condition: Deployment "nginx" is created
   kube::test::get_object_assert deployment "{{range.items}}{{$id_field}}:{{end}}" 'nginx:'
   # Clean up
@@ -1267,26 +1272,26 @@ __EOF__
   kube::test::get_object_assert deployment "{{range.items}}{{$id_field}}:{{end}}" ''
   # Command
   # Create a deployment (revision 1)
-  kubectl create -f docs/user-guide/deployment.yaml "${kube_flags[@]}"
+  kubectl create -f hack/testdata/deployment-revision1.yaml "${kube_flags[@]}"
   kube::test::get_object_assert deployment "{{range.items}}{{$id_field}}:{{end}}" 'nginx-deployment:'
-  kube::test::get_object_assert deployment "{{range.items}}{{$deployment_image_field}}:{{end}}" 'nginx:'
+  kube::test::get_object_assert deployment "{{range.items}}{{$deployment_image_field}}:{{end}}" "${IMAGE_DEPLOYMENT_R1}:"
   # Rollback to revision 1 - should be no-op
   kubectl rollout undo deployment nginx-deployment --to-revision=1 "${kube_flags[@]}"
-  kube::test::get_object_assert deployment "{{range.items}}{{$deployment_image_field}}:{{end}}" 'nginx:'
+  kube::test::get_object_assert deployment "{{range.items}}{{$deployment_image_field}}:{{end}}" "${IMAGE_DEPLOYMENT_R1}:"
   # Update the deployment (revision 2)
   kubectl apply -f hack/testdata/deployment-revision2.yaml "${kube_flags[@]}"
-  kube::test::get_object_assert deployment.extensions "{{range.items}}{{$deployment_image_field}}:{{end}}" 'nginx:latest:'
+  kube::test::get_object_assert deployment.extensions "{{range.items}}{{$deployment_image_field}}:{{end}}" "${IMAGE_DEPLOYMENT_R2}:"
   # Rollback to revision 1
   kubectl rollout undo deployment nginx-deployment --to-revision=1 "${kube_flags[@]}"
   sleep 1
-  kube::test::get_object_assert deployment "{{range.items}}{{$deployment_image_field}}:{{end}}" 'nginx:'
+  kube::test::get_object_assert deployment "{{range.items}}{{$deployment_image_field}}:{{end}}" "${IMAGE_DEPLOYMENT_R1}:"
   # Rollback to revision 1000000 - should be no-op
   kubectl rollout undo deployment nginx-deployment --to-revision=1000000 "${kube_flags[@]}"
-  kube::test::get_object_assert deployment "{{range.items}}{{$deployment_image_field}}:{{end}}" 'nginx:'
+  kube::test::get_object_assert deployment "{{range.items}}{{$deployment_image_field}}:{{end}}" "${IMAGE_DEPLOYMENT_R1}:"
   # Rollback to last revision
   kubectl rollout undo deployment nginx-deployment "${kube_flags[@]}"
   sleep 1
-  kube::test::get_object_assert deployment "{{range.items}}{{$deployment_image_field}}:{{end}}" 'nginx:latest:'
+  kube::test::get_object_assert deployment "{{range.items}}{{$deployment_image_field}}:{{end}}" "${IMAGE_DEPLOYMENT_R2}:"
   # Pause the deployment
   kubectl-with-retry rollout pause deployment nginx-deployment "${kube_flags[@]}"
   # A paused deployment cannot be rolled back
diff --git a/hack/testdata/deployment-revision1.yaml b/hack/testdata/deployment-revision1.yaml
new file mode 100644
index 00000000000..75daa6703f8
--- /dev/null
+++ b/hack/testdata/deployment-revision1.yaml
@@ -0,0 +1,21 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: nginx-deployment
+  labels:
+    name: nginx-deployment
+spec:
+  replicas: 3
+  selector:
+    matchLabels:
+      name: nginx
+  template:
+    metadata:
+      labels:
+        name: nginx
+    spec:
+      containers:
+      - name: nginx
+        image: gcr.io/google-containers/nginx:test-cmd
+        ports:
+        - containerPort: 80
diff --git a/hack/testdata/deployment-revision2.yaml b/hack/testdata/deployment-revision2.yaml
index e723526b106..092dfb76594 100644
--- a/hack/testdata/deployment-revision2.yaml
+++ b/hack/testdata/deployment-revision2.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1 
+apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: nginx-deployment
@@ -16,6 +16,6 @@ spec:
     spec:
       containers:
       - name: nginx
-        image: nginx:latest
+        image: gcr.io/google-containers/nginx:1.7.9
         ports:
         - containerPort: 80
diff --git a/hack/testdata/multi-resource-json-modify.json b/hack/testdata/multi-resource-json-modify.json
index 2216086b88a..3ff562e6d9a 100644
--- a/hack/testdata/multi-resource-json-modify.json
+++ b/hack/testdata/multi-resource-json-modify.json
@@ -43,7 +43,7 @@
        "spec":{
          "containers":[{
            "name": "mock-container",
-           "image": "kubernetes/pause",
+           "image": "gcr.io/google-containers/pause:2.0",
            "ports":[{
              "containerPort":9949,
              "protocol":"TCP"
diff --git a/hack/testdata/multi-resource-json.json b/hack/testdata/multi-resource-json.json
index ba8914e9045..8ba2198e6d2 100644
--- a/hack/testdata/multi-resource-json.json
+++ b/hack/testdata/multi-resource-json.json
@@ -41,7 +41,7 @@
        "spec":{
          "containers":[{
            "name": "mock-container",
-           "image": "kubernetes/pause",
+           "image": "gcr.io/google-containers/pause:2.0",
            "ports":[{
              "containerPort":9949,
              "protocol":"TCP"
diff --git a/hack/testdata/multi-resource-list-modify.json b/hack/testdata/multi-resource-list-modify.json
index dded5a43ac5..e0885c10241 100644
--- a/hack/testdata/multi-resource-list-modify.json
+++ b/hack/testdata/multi-resource-list-modify.json
@@ -47,7 +47,7 @@
                "spec":{
                   "containers":[{
                     "name": "mock-container",
-                    "image": "kubernetes/pause",
+                    "image": "gcr.io/google-containers/pause:2.0",
                     "ports":[{
                         "containerPort":9949,
                         "protocol":"TCP"
diff --git a/hack/testdata/multi-resource-list.json b/hack/testdata/multi-resource-list.json
index fd3396e58e8..8918223aede 100644
--- a/hack/testdata/multi-resource-list.json
+++ b/hack/testdata/multi-resource-list.json
@@ -45,7 +45,7 @@
                "spec":{
                   "containers":[{
                     "name": "mock-container",
-                    "image": "kubernetes/pause",
+                    "image": "gcr.io/google-containers/pause:2.0",
                     "ports":[{
                         "containerPort":9949,
                         "protocol":"TCP"
diff --git a/hack/testdata/multi-resource-rclist-modify.json b/hack/testdata/multi-resource-rclist-modify.json
index 6b050d8768b..369d73399b9 100644
--- a/hack/testdata/multi-resource-rclist-modify.json
+++ b/hack/testdata/multi-resource-rclist-modify.json
@@ -26,7 +26,7 @@
                "spec":{
                   "containers":[{
                     "name": "mock-container",
-                    "image": "kubernetes/pause",
+                    "image": "gcr.io/google-containers/pause:2.0",
                     "ports":[{
                         "containerPort":9949,
                         "protocol":"TCP"
@@ -60,7 +60,7 @@
             "spec":{
               "containers":[{
                 "name": "mock-container",
-                "image": "kubernetes/pause",
+                "image": "gcr.io/google-containers/pause:2.0",
                 "ports":[{
                   "containerPort":9949,
                   "protocol":"TCP"
diff --git a/hack/testdata/multi-resource-rclist.json b/hack/testdata/multi-resource-rclist.json
index 6b050d8768b..369d73399b9 100644
--- a/hack/testdata/multi-resource-rclist.json
+++ b/hack/testdata/multi-resource-rclist.json
@@ -26,7 +26,7 @@
                "spec":{
                   "containers":[{
                     "name": "mock-container",
-                    "image": "kubernetes/pause",
+                    "image": "gcr.io/google-containers/pause:2.0",
                     "ports":[{
                         "containerPort":9949,
                         "protocol":"TCP"
@@ -60,7 +60,7 @@
             "spec":{
               "containers":[{
                 "name": "mock-container",
-                "image": "kubernetes/pause",
+                "image": "gcr.io/google-containers/pause:2.0",
                 "ports":[{
                   "containerPort":9949,
                   "protocol":"TCP"
diff --git a/hack/testdata/multi-resource-yaml-modify.yaml b/hack/testdata/multi-resource-yaml-modify.yaml
index 7b345a1e5ab..c5e9b32f958 100644
--- a/hack/testdata/multi-resource-yaml-modify.yaml
+++ b/hack/testdata/multi-resource-yaml-modify.yaml
@@ -27,7 +27,7 @@ spec:
     spec:
       containers:
       - name: mock-container
-        image: kubernetes/pause
+        image: gcr.io/google-containers/pause:2.0
         ports:
         - containerPort: 9949
-          protocol: TCP
\ No newline at end of file
+          protocol: TCP
diff --git a/hack/testdata/multi-resource-yaml.yaml b/hack/testdata/multi-resource-yaml.yaml
index 6f84f66307b..760fdefb09f 100644
--- a/hack/testdata/multi-resource-yaml.yaml
+++ b/hack/testdata/multi-resource-yaml.yaml
@@ -25,7 +25,7 @@ spec:
     spec:
       containers:
       - name: mock-container
-        image: kubernetes/pause
+        image: gcr.io/google-containers/pause:2.0
         ports:
         - containerPort: 9949
-          protocol: TCP
\ No newline at end of file
+          protocol: TCP
diff --git a/hack/testdata/pod-apply.yaml b/hack/testdata/pod-apply.yaml
index 3b8df43f260..a736a599d86 100644
--- a/hack/testdata/pod-apply.yaml
+++ b/hack/testdata/pod-apply.yaml
@@ -7,4 +7,4 @@ metadata:
 spec:
   containers:
   - name: kubernetes-pause
-    image: kubernetes/pause
\ No newline at end of file
+    image: gcr.io/google-containers/pause:2.0
diff --git a/hack/testdata/pod-with-large-name.yaml b/hack/testdata/pod-with-large-name.yaml
index c8deebc11a8..5fb3c343bfa 100644
--- a/hack/testdata/pod-with-large-name.yaml
+++ b/hack/testdata/pod-with-large-name.yaml
@@ -8,4 +8,4 @@ metadata:
 spec:
   containers:
   - name: kubernetes-serve-hostname
-    image: gcr.io/google_containers/serve_hostname
+    image: gcr.io/google_containers/serve_hostname:v1.4
diff --git a/hack/testdata/pod.yaml b/hack/testdata/pod.yaml
index 99499fd870b..8ccadcecdbd 100644
--- a/hack/testdata/pod.yaml
+++ b/hack/testdata/pod.yaml
@@ -7,4 +7,4 @@ metadata:
 spec:
   containers:
   - name: kubernetes-pause
-    image: kubernetes/pause
\ No newline at end of file
+    image: gcr.io/google-containers/pause:2.0