From 71125d6483cfd1274503ef059982ff1c5fe0ce95 Mon Sep 17 00:00:00 2001
From: Matt Boersma <mboersma@deis.com>
Date: Thu, 4 Feb 2016 10:20:55 -0700
Subject: [PATCH 1/2] fix(elasticsearch-1): name provider properly for tests

---
 elasticsearch-1/manifests/elasticsearch-rc.yaml  | 6 +++---
 elasticsearch-1/manifests/elasticsearch-svc.yaml | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/elasticsearch-1/manifests/elasticsearch-rc.yaml b/elasticsearch-1/manifests/elasticsearch-rc.yaml
index 3d1c5978d5..d5e43c49a7 100644
--- a/elasticsearch-1/manifests/elasticsearch-rc.yaml
+++ b/elasticsearch-1/manifests/elasticsearch-rc.yaml
@@ -3,17 +3,17 @@ kind: ReplicationController
 metadata:
   name: elasticsearch
   labels:
-    provider: elasticsearch
+    provider: elasticsearch-1
     heritage: helm
 spec:
   replicas: 1
   selector:
-    provider: elasticsearch
+    provider: elasticsearch-1
   template:
     metadata:
       name: elasticsearch-1
       labels:
-        provider: elasticsearch
+        provider: elasticsearch-1
     spec:
       containers:
       - name: elasticsearch
diff --git a/elasticsearch-1/manifests/elasticsearch-svc.yaml b/elasticsearch-1/manifests/elasticsearch-svc.yaml
index 3a36e75a12..27045ef171 100644
--- a/elasticsearch-1/manifests/elasticsearch-svc.yaml
+++ b/elasticsearch-1/manifests/elasticsearch-svc.yaml
@@ -3,7 +3,7 @@ kind: Service
 metadata:
   name: elasticsearch
   labels:
-    provider: elasticsearch
+    provider: elasticsearch-1
     heritage: helm
 spec:
   ports:
@@ -12,4 +12,4 @@ spec:
   - name: peer
     port: 9300
   selector:
-    provider: elasticsearch
+    provider: elasticsearch-1

From 67ce367f43647d5766ccf3fdb107588f059e1f28 Mon Sep 17 00:00:00 2001
From: Matt Boersma <mboersma@deis.com>
Date: Thu, 4 Feb 2016 10:21:49 -0700
Subject: [PATCH 2/2] Revert "fix(elasticsearch-1): name pod properly for
 tests"

This reverts commit 6ad73f9bb07913cd61f99fbd0e97f3f9d23efd1a.
---
 elasticsearch-1/manifests/elasticsearch-rc.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/elasticsearch-1/manifests/elasticsearch-rc.yaml b/elasticsearch-1/manifests/elasticsearch-rc.yaml
index d5e43c49a7..0fb273b375 100644
--- a/elasticsearch-1/manifests/elasticsearch-rc.yaml
+++ b/elasticsearch-1/manifests/elasticsearch-rc.yaml
@@ -11,7 +11,7 @@ spec:
     provider: elasticsearch-1
   template:
     metadata:
-      name: elasticsearch-1
+      name: elasticsearch
       labels:
         provider: elasticsearch-1
     spec: