From b365408e8886145e4b23faa7de7b97347ebd97dd Mon Sep 17 00:00:00 2001
From: Jing Ai <jinga@google.com>
Date: Tue, 12 Jun 2018 10:53:54 -0700
Subject: [PATCH] A few cleanups (remove duplicated env vars & unnecessary
 comments) on yaml files.

---
 .../calico-policy-controller/calico-node-daemonset.yaml     | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/cluster/addons/calico-policy-controller/calico-node-daemonset.yaml b/cluster/addons/calico-policy-controller/calico-node-daemonset.yaml
index 044cd13cd76..96440e74d85 100644
--- a/cluster/addons/calico-policy-controller/calico-node-daemonset.yaml
+++ b/cluster/addons/calico-policy-controller/calico-node-daemonset.yaml
@@ -41,8 +41,6 @@ spec:
               value: "none"
             - name: DATASTORE_TYPE
               value: "kubernetes"
-            - name: FELIX_TYPHAK8SSERVICENAME
-              value: "calico-typha"
             - name: FELIX_DEFAULTENDPOINTTOHOSTACTION
               value: "ACCEPT"
             - name: FELIX_HEALTHENABLED
@@ -55,8 +53,6 @@ spec:
               value: "info"
             - name: FELIX_PROMETHEUSMETRICSENABLED
               value: "true"
-            - name: FELIX_HEALTHENABLED
-              value: "true"
             - name: FELIX_REPORTINGINTERVALSECS
               value: "0"
             - name: FELIX_TYPHAK8SSERVICENAME
@@ -163,11 +159,9 @@ spec:
         - name: cni-net-dir
           hostPath:
             path: /etc/cni/net.d
-        # Used to
         - name: var-run-calico
           hostPath:
             path: /var/run/calico
-        # Used to
         - name: var-lib-calico
           hostPath:
             path: /var/lib/calico