From cb17a2b6a6a086dff147188fcde8b1742d3bc78e Mon Sep 17 00:00:00 2001
From: Jordan Liggitt <liggitt@google.com>
Date: Wed, 6 Nov 2019 17:29:15 -0500
Subject: [PATCH] Fix run_pod_tests

---
 test/cmd/core.sh                              | 12 +++----
 .../kubectl/agnhost-master-pod.yaml           | 32 +++++++++++++++++++
 2 files changed, 38 insertions(+), 6 deletions(-)
 create mode 100644 test/e2e/testing-manifests/kubectl/agnhost-master-pod.yaml

diff --git a/test/cmd/core.sh b/test/cmd/core.sh
index f7d69849216..53b4de3a9ec 100755
--- a/test/cmd/core.sh
+++ b/test/cmd/core.sh
@@ -278,15 +278,15 @@ run_pod_tests() {
   kube::test::get_object_assert pods "{{range.items}}{{$id_field}}:{{end}}" ''
   # Command
   kubectl create -f test/fixtures/doc-yaml/admin/limitrange/valid-pod.yaml "${kube_flags[@]}"
-  kubectl create -f test/e2e/testing-manifests/kubectl/redis-master-pod.yaml "${kube_flags[@]}"
-  # Post-condition: valid-pod and redis-master PODs are created
-  kube::test::get_object_assert pods "{{range.items}}{{$id_field}}:{{end}}" 'redis-master:valid-pod:'
+  kubectl create -f test/e2e/testing-manifests/kubectl/agnhost-master-pod.yaml "${kube_flags[@]}"
+  # Post-condition: valid-pod and agnhost-master PODs are created
+  kube::test::get_object_assert pods "{{range.items}}{{$id_field}}:{{end}}" 'agnhost-master:valid-pod:'
 
   ### Delete multiple PODs at once
-  # Pre-condition: valid-pod and redis-master PODs exist
-  kube::test::get_object_assert pods "{{range.items}}{{$id_field}}:{{end}}" 'redis-master:valid-pod:'
+  # Pre-condition: valid-pod and agnhost-master PODs exist
+  kube::test::get_object_assert pods "{{range.items}}{{$id_field}}:{{end}}" 'agnhost-master:valid-pod:'
   # Command
-  kubectl delete pods valid-pod redis-master "${kube_flags[@]}" --grace-period=0 --force # delete multiple pods at once
+  kubectl delete pods valid-pod agnhost-master "${kube_flags[@]}" --grace-period=0 --force # delete multiple pods at once
   # Post-condition: no POD exists
   kube::test::get_object_assert pods "{{range.items}}{{$id_field}}:{{end}}" ''
 
diff --git a/test/e2e/testing-manifests/kubectl/agnhost-master-pod.yaml b/test/e2e/testing-manifests/kubectl/agnhost-master-pod.yaml
new file mode 100644
index 00000000000..a116b9004eb
--- /dev/null
+++ b/test/e2e/testing-manifests/kubectl/agnhost-master-pod.yaml
@@ -0,0 +1,32 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  labels:
+    name: agnhost
+    role: master
+  name: agnhost-master
+spec:
+  containers:
+    - name: master
+      image: gcr.io/kubernetes-e2e-test-images/agnhost:1.0
+      env:
+        - name: MASTER
+          value: "true"
+      ports:
+        - containerPort: 6379
+      resources:
+        limits:
+          cpu: "0.1"
+      volumeMounts:
+        - mountPath: /agnhost-master-data
+          name: data
+    - name: sentinel
+      image: gcr.io/kubernetes-e2e-test-images/agnhost:1.0
+      env:
+        - name: SENTINEL
+          value: "true"
+      ports:
+        - containerPort: 26379
+  volumes:
+    - name: data
+      emptyDir: {}