Skip to content

K
k3s
Commit df1cfae3 authored by Zach Loafman's avatar Zach Loafman
Browse files
Options

Merge pull request #7326 from roberthbailey/client-cert-auth

Pass the CA root cert into the apiserver
parents 0eca26fa 846ffcff
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest
View file @ df1cfae3
...@@ -43,10 +43,12 @@ ...@@ -43,10 +43,12 @@
{% 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 client_ca_file = "--client_ca_file=/dev/null" -%}
{% set secure_port = "6443" -%} {% set secure_port = "6443" -%}
{% if grains['cloud'] is defined and grains['cloud'] == 'gce' %} {% if grains['cloud'] is defined and grains['cloud'] == 'gce' %}
{% set secure_port = "443" -%} {% set secure_port = "443" -%}
{% set client_ca_file = "--client_ca_file=/srv/kubernetes/ca.crt" -%}
{% endif -%} {% endif -%}
{% set token_auth_file = "--token_auth_file=/dev/null" -%} {% set token_auth_file = "--token_auth_file=/dev/null" -%}
...@@ -92,6 +94,7 @@ ...@@ -92,6 +94,7 @@
"{{key_file}}", "{{key_file}}",
"--secure_port={{secure_port}}", "--secure_port={{secure_port}}",
"{{token_auth_file}}", "{{token_auth_file}}",
"{{client_ca_file}}",
"{{publicAddressOverride}}", "{{publicAddressOverride}}",
"{{pillar['log_level']}}" "{{pillar['log_level']}}"
], ],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment