diff --git a/cluster/saltbase/salt/kubelet/init.sls b/cluster/saltbase/salt/kubelet/init.sls index 1212efe44db..3e85b63bdef 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 00000000000..e69de29bb2d