github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-12 12:48:51 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10264 from mikedanese/ca-token

Browse Source 
add ca cert to token controller and all service accounts
This commit is contained in:
Maxwell Forbes
2015-06-25 09:56:35 -07:00
parent fc349fdd47 5760fe1957
commit 655179dcfb
11 changed files with 69 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cluster/saltbase/salt/kube-controller-manager/kube-controller-manager.manifest
View File

@@ -28,7 +28,13 @@
{% endif -%}
{% endif -%}
{% set params = "--master=127.0.0.1:8080" + " " + cluster_name + " " + cluster_cidr + " " + allocate_node_cidrs + " " + cloud_provider + " " + cloud_config + service_account_key + pillar['log_level'] -%}
{% set root_ca_file = "" -%}
{% if grains['cloud'] is defined and grains.cloud in [ 'aws', 'gce' ] %}
{% set root_ca_file = "--root_ca_file=/srv/kubernetes/ca.crt" -%}
{% endif -%}
{% set params = "--master=127.0.0.1:8080" + " " + cluster_name + " " + cluster_cidr + " " + allocate_node_cidrs + " " + cloud_provider + " " + cloud_config + service_account_key + pillar['log_level'] + " " + root_ca_file -%}
{
"apiVersion": "v1beta3",