github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 15:05:27 +00:00
Code Issues Projects Releases Wiki Activity

Don't reference non-existent token file if not GCE.

Browse Source
This commit is contained in:
Eric Tune 2014-11-17 23:33:07 -08:00
parent 46dcacfa93
commit 67adf6473e
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/gce/templates/create-dynamic-salt-files.sh
View File

@ -29,8 +29,6 @@ EOF
mkdir -p /srv/salt-overlay/salt/nginx mkdir -p /srv/salt-overlay/salt/nginx
echo $MASTER_HTPASSWD > /srv/salt-overlay/salt/nginx/htpasswd echo $MASTER_HTPASSWD > /srv/salt-overlay/salt/nginx/htpasswd
# TODO: do aws.
# Generate and distribute a shared secret (bearer token) to # Generate and distribute a shared secret (bearer token) to
# apiserver and kubelet so that kubelet can authenticate to # apiserver and kubelet so that kubelet can authenticate to
# apiserver to send events. # apiserver to send events.

10
cluster/saltbase/salt/kube-apiserver/default
View File

@ -29,7 +29,15 @@
{% set cert_file = "-tls_cert_file=/srv/kubernetes/server.cert" %} {% set cert_file = "-tls_cert_file=/srv/kubernetes/server.cert" %}
{% set key_file = "-tls_private_key_file=/srv/kubernetes/server.key" %} {% set key_file = "-tls_private_key_file=/srv/kubernetes/server.key" %}
{% set secure_port = "-secure_port=6443" %} {% set secure_port = "-secure_port=6443" %}
{% set token_auth_file = "-token_auth_file=/srv/kubernetes/known_tokens.csv" %} {% set token_auth_file = "-token_auth_file=/dev/null" %}
{% if grains.cloud is defined %}
{% if grains.cloud == 'gce' %}
# TODO: generate and distribute tokens for other cloud providers.
{% set token_auth_file = "-token_auth_file=/srv/kubernetes/known_tokens.csv" %}
{% endif %}
{% endif %}
DAEMON_ARGS="{{daemon_args}} {{address}} {{etcd_servers}} {{ cloud_provider }} --allow_privileged={{pillar['allow_privileged']}} {{portal_net}} {{cert_file}} {{key_file}} {{secure_port}} {{token_auth_file}}" DAEMON_ARGS="{{daemon_args}} {{address}} {{etcd_servers}} {{ cloud_provider }} --allow_privileged={{pillar['allow_privileged']}} {{portal_net}} {{cert_file}} {{key_file}} {{secure_port}} {{token_auth_file}}"

6
cluster/saltbase/salt/kube-apiserver/init.sls
View File

@ -38,6 +38,9 @@
{% endif %} {% endif %}
{% if grains.cloud is defined %}
{% if grains.cloud == 'gce' %}
# TODO: generate and distribute tokens on other cloud providers.
/srv/kubernetes/known_tokens.csv: /srv/kubernetes/known_tokens.csv:
file.managed: file.managed:
- source: salt://kube-apiserver/known_tokens.csv - source: salt://kube-apiserver/known_tokens.csv
@ -45,6 +48,9 @@
- group: kube-apiserver - group: kube-apiserver
- mode: 400 - mode: 400
{% endif %}
{% endif %}
kube-apiserver: kube-apiserver:
group.present: group.present:
- system: True - system: True