From 6d676dc541205ff816ee184c7cbf4f222dd16372 Mon Sep 17 00:00:00 2001
From: jafar390 <jafar390@github.com>
Date: Thu, 7 Nov 2019 05:31:41 +0000
Subject: [PATCH] etcd cleanup

---
 ksonnet/dkube/daemonset.libsonnet | 9 +++++++++
 ksonnet/service/etcd.libsonnet    | 3 ---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ksonnet/dkube/daemonset.libsonnet b/ksonnet/dkube/daemonset.libsonnet
index f5812c1..c335f97 100644
--- a/ksonnet/dkube/daemonset.libsonnet
+++ b/ksonnet/dkube/daemonset.libsonnet
@@ -317,6 +317,15 @@
                                 "name": "DKUBE_APISERVER_ROLE",
                                 "value": "worker"
                             },
+                            {
+                                "name": "NODENAME",
+                                "valueFrom": {
+                                    "fieldRef": {
+                                    "apiVersion": "v1",
+                                    "fieldPath": "spec.nodeName"
+                                    }
+                                }
+                            },
                         ],
                         "image": apiServerImage,
                         "imagePullPolicy": "IfNotPresent",
diff --git a/ksonnet/service/etcd.libsonnet b/ksonnet/service/etcd.libsonnet
index 996d924..cd1452e 100644
--- a/ksonnet/service/etcd.libsonnet
+++ b/ksonnet/service/etcd.libsonnet
@@ -24,9 +24,6 @@
 	"apiVersion": "v1",
 	    "kind": "Service",
         "metadata": {
-            "annotations": {
-                "getambassador.io/config": "---\napiVersion: ambassador/v0\nkind:  Mapping\nname:  dkube_etcd\nprefix: /dkube/v2/etcd/\nrewrite: /\ntimeout_ms: 600000\nservice: dkube-db-server:2379"
-            },
             "name": "dkube-db-server",
             "namespace": "dkube"
 	    },