mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-09-17 15:13:08 +00:00
Don't reference non-existent token file if not GCE.
This commit is contained in:
@@ -29,7 +29,15 @@
|
||||
|
||||
{% set cert_file = "-tls_cert_file=/srv/kubernetes/server.cert" %}
|
||||
{% set key_file = "-tls_private_key_file=/srv/kubernetes/server.key" %}
|
||||
|
||||
{% 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}}"
|
||||
|
@@ -38,6 +38,9 @@
|
||||
|
||||
{% endif %}
|
||||
|
||||
{% if grains.cloud is defined %}
|
||||
{% if grains.cloud == 'gce' %}
|
||||
# TODO: generate and distribute tokens on other cloud providers.
|
||||
/srv/kubernetes/known_tokens.csv:
|
||||
file.managed:
|
||||
- source: salt://kube-apiserver/known_tokens.csv
|
||||
@@ -45,6 +48,9 @@
|
||||
- group: kube-apiserver
|
||||
- mode: 400
|
||||
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
kube-apiserver:
|
||||
group.present:
|
||||
- system: True
|
||||
|
Reference in New Issue
Block a user