From ec76e5ce80dadff6e7903c3ebd927359363f3f02 Mon Sep 17 00:00:00 2001
From: Aled Sage <aled.sage@gmail.com>
Date: Sat, 19 May 2018 22:23:17 +0100
Subject: [PATCH] Fix k8s qa test

Testing recovery from killing k8s-master fails sometimes, if it chooses
the first master (the only one with prometheus pod), as last test
assertion is that prometheus is reachable.
---
 kubernetes/catalog/kubernetes/kubernetes.bom     | 2 +-
 kubernetes/tests/kubernetes/kubernetes.tests.bom | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kubernetes/catalog/kubernetes/kubernetes.bom b/kubernetes/catalog/kubernetes/kubernetes.bom
index e0f84079..05c3e4a8 100644
--- a/kubernetes/catalog/kubernetes/kubernetes.bom
+++ b/kubernetes/catalog/kubernetes/kubernetes.bom
@@ -363,7 +363,7 @@ brooklyn.catalog:
             dynamiccluster.memberspec:
               $brooklyn:entitySpec:
                 type: kubernetes-master
-                id: kubernetes-master
+                id: kubernetes-master-notfirst
                 name: "kubernetes-master"
                 brooklyn.config:
                   latch.install: $brooklyn:entity("kubernetes-manager-load-balancer").attributeWhenReady("service.isUp")
diff --git a/kubernetes/tests/kubernetes/kubernetes.tests.bom b/kubernetes/tests/kubernetes/kubernetes.tests.bom
index ccd58829..a2e31f89 100644
--- a/kubernetes/tests/kubernetes/kubernetes.tests.bom
+++ b/kubernetes/tests/kubernetes/kubernetes.tests.bom
@@ -31,7 +31,7 @@ brooklyn.catalog:
             equals: 3
         - type: org.apache.brooklyn.test.framework.SimpleShellCommandTest
           name: "4. Kill a master node"
-          target: $brooklyn:entity("kubernetes-master")
+          target: $brooklyn:entity("kubernetes-master-notfirst")
           command: |
             nohup sudo bash -c 'sleep 10 && shutdown -h -t0 now' &
         - type: org.apache.brooklyn.test.framework.TestSensor
@@ -84,14 +84,14 @@ brooklyn.catalog:
             kubectl run workload-b --image=brooklyncentral/centos:7 --replicas=1 --port=22
         - type: org.apache.brooklyn.test.framework.SimpleShellCommandTest
           name: "13. Assert [A] running"
-          target: $brooklyn:entity("kubernetes-master")
+          target: $brooklyn:entity("kubernetes-master-notfirst")
           command: |
             kubectl get pods | grep -i running
           assertOut:
             contains: 'workload-a'
         - type: org.apache.brooklyn.test.framework.SimpleShellCommandTest
           name: "14. Assert [B] running"
-          target: $brooklyn:entity("kubernetes-master")
+          target: $brooklyn:entity("kubernetes-master-notfirst")
           command: |
             kubectl get pods | grep -i running
           assertOut: