From 434b74da63b8832d63e8629326c45a1049a1cd6a Mon Sep 17 00:00:00 2001
From: Satnam Singh <satnam@google.com>
Date: Thu, 19 Feb 2015 14:30:53 -0800
Subject: [PATCH] Delete cluster level logging services during kube down

---
 cluster/gce/util.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh
index f44223a8e9b..e92a0df9f9c 100755
--- a/cluster/gce/util.sh
+++ b/cluster/gce/util.sh
@@ -911,6 +911,10 @@ function teardown-logging-firewall {
 
   detect-project
   gcloud compute firewall-rules delete -q "${INSTANCE_PREFIX}-fluentd-elasticsearch-logging" --project "${PROJECT}" || true
+  # Also delete the logging services which will remove the associated forwarding rules (TCP load balancers).
+  local kubectl="${KUBE_ROOT}/cluster/kubectl.sh"
+  "${kubectl}" delete services elasticsearch-logging || true
+  "${kubectl}" delete services kibana-logging || true
 }
 
 # Perform preparations required to run e2e tests