From 658c5cdaaa0df8e2f40d84bb2d9d4a524b26b22f Mon Sep 17 00:00:00 2001
From: Joe Beda <joe.github@bedafamily.com>
Date: Thu, 20 Nov 2014 16:50:43 -0800
Subject: [PATCH] Check in default blank file for kubelet/kubernetes_auth

This lets us eliminate some per-cloud stuff in our salt.  This is an alternate fix for #2475.
---
 cluster/saltbase/salt/kubelet/init.sls        | 14 +++++---------
 cluster/saltbase/salt/kubelet/kubernetes_auth |  0
 2 files changed, 5 insertions(+), 9 deletions(-)
 create mode 100644 cluster/saltbase/salt/kubelet/kubernetes_auth

diff --git a/cluster/saltbase/salt/kubelet/init.sls b/cluster/saltbase/salt/kubelet/init.sls
index 1212efe44d..3e85b63bde 100644
--- a/cluster/saltbase/salt/kubelet/init.sls
+++ b/cluster/saltbase/salt/kubelet/init.sls
@@ -38,17 +38,17 @@
 
 {% endif %}
 
-{% if grains.cloud is defined %}
-{% if grains.cloud == 'gce' %}
-# Kubelet will run without this file but will not be able to send events to the apiserver.
+# The default here is that this file is blank.  If this is the case, the kubelet
+# won't be able to parse it as JSON and it'll not be able to publish events to
+# the apiserver.  You'll see a single error line in the kubelet start up file
+# about this.
 /var/lib/kubelet/kubernetes_auth:
   file.managed:
     - source: salt://kubelet/kubernetes_auth
     - user: root
     - group: root
     - mode: 400
-{% endif %}
-{% endif %}
+    - makedirs: true
 
 kubelet:
   group.present:
@@ -69,9 +69,5 @@ kubelet:
 {% if grains['os_family'] != 'RedHat' %}
       - file: /etc/init.d/kubelet
 {% endif %}
-{% if grains.cloud is defined %}
-{% if grains.cloud == 'gce' %}
       - file: /var/lib/kubelet/kubernetes_auth
-{% endif %}
-{% endif %}
 
diff --git a/cluster/saltbase/salt/kubelet/kubernetes_auth b/cluster/saltbase/salt/kubelet/kubernetes_auth
new file mode 100644
index 0000000000..e69de29bb2