Merge pull request #8104 from roberthbailey/kubelet-using-kubeconfig

Replace the auth config file with a kubeconfig file when starting the kubelet on GCE.
This commit is contained in:
Jeff Lowdermilk
2015-05-13 11:09:27 -07:00
7 changed files with 118 additions and 19 deletions

View File

@@ -38,6 +38,20 @@
{% endif %}
# 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 will try to use the kubernetes_auth file
# instead. You'll see a single error line in the kubelet start up file
# about this.
/var/lib/kubelet/kubeconfig:
file.managed:
- source: salt://kubelet/kubeconfig
- user: root
- group: root
- mode: 400
- makedirs: true
#
# --- This file is DEPRECATED ---
# 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