Merge pull request #22 from caseydavenport/cd4-etc-hosts

Don't configure /etc/hosts by default.
projectcalico · Apr 18, 2016 · 26de923 · 26de923
2 parents f804adc + 980bb83
commit 26de923
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/policy_agent.py b/policy_agent.py
@@ -477,9 +477,12 @@ def configure_etc_hosts():
     _log.addHandler(stdout_hdlr)
     _log.setLevel(log_level)
 
-    # Configure /etc/hosts with Kubernetes API.
-    _log.info("Configuring /etc/hosts")
-    configure_etc_hosts()
+    if os.environ.get("CONFIGURE_ETC_HOSTS", "false").lower() == "true":
+        # Configure /etc/hosts with Kubernetes API.
+        # Don't do this by default, since it is recommended to run
+        # this pod using host networking on the master.
+        _log.info("Configuring /etc/hosts")
+        configure_etc_hosts()
 
     _log.info("Beginning execution")
     PolicyAgent().run()