From b6be7f25ad2fad55954b782d12131fff2f3f7135 Mon Sep 17 00:00:00 2001
From: Mark Burnett <mark.m.burnett@gmail.com>
Date: Tue, 8 May 2018 13:05:00 -0500
Subject: [PATCH] Remove HAProxy reference to default namespace

Change-Id: Id42558835fd1c84a8aacfb6f5f7c2d12f57e437f
---
 charts/haproxy/values.yaml                               | 5 ++---
 examples/basic/armada-resources.yaml                     | 1 -
 examples/complete/armada-resources.yaml                  | 1 -
 tools/gate/config-templates/bootstrap-armada-config.yaml | 1 -
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/charts/haproxy/values.yaml b/charts/haproxy/values.yaml
index 3f8e32aa..fc6182e6 100644
--- a/charts/haproxy/values.yaml
+++ b/charts/haproxy/values.yaml
@@ -20,8 +20,8 @@ conf:
     period: 30
     kubernetes_url: https://kubernetes.default:443
     services:
-      default:
-        kubernetes:
+      kube-system:
+        kubernetes-apiserver:
           server_opts: "check"
           conf_parts:
             frontend:
@@ -31,7 +31,6 @@ conf:
               - mode tcp
               - option tcp-check
               - option redispatch
-      kube-system:
         kubernetes-etcd:
           server_opts: "check"
           conf_parts:
diff --git a/examples/basic/armada-resources.yaml b/examples/basic/armada-resources.yaml
index cba1a0b6..6d487b50 100644
--- a/examples/basic/armada-resources.yaml
+++ b/examples/basic/armada-resources.yaml
@@ -607,7 +607,6 @@ data:
       anchor:
         kubernetes_url: https://10.96.0.1:443
         services:
-          default: null
           kube-system:
             kubernetes-apiserver:
               server_opts: "check port 6443"
diff --git a/examples/complete/armada-resources.yaml b/examples/complete/armada-resources.yaml
index 076c7d27..ae114a5b 100644
--- a/examples/complete/armada-resources.yaml
+++ b/examples/complete/armada-resources.yaml
@@ -620,7 +620,6 @@ data:
       anchor:
         kubernetes_url: https://10.96.0.1:443
         services:
-          default: null
           kube-system:
             kubernetes-apiserver:
               server_opts: "check port 6443"
diff --git a/tools/gate/config-templates/bootstrap-armada-config.yaml b/tools/gate/config-templates/bootstrap-armada-config.yaml
index c7087f79..3e362a2f 100644
--- a/tools/gate/config-templates/bootstrap-armada-config.yaml
+++ b/tools/gate/config-templates/bootstrap-armada-config.yaml
@@ -555,7 +555,6 @@ data:
       anchor:
         kubernetes_url: https://10.96.0.1:443
         services:
-          default: null
           kube-system:
             kubernetes-apiserver:
               server_opts: "check port 6443"