github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-02 08:17:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9747 from justinsb/aws_dont_register_master_kubelet

Browse Source 
AWS: Stop the master kubelet from registering as a node (like GCE does)
This commit is contained in:
Fabio Yeon 2015-06-15 13:30:54 -07:00
commit 4fc1570dcc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/saltbase/salt/kubelet/default
View File

@ -22,13 +22,13 @@
{% set api_servers_with_port = api_servers + ":6443" -%} {% set api_servers_with_port = api_servers + ":6443" -%}
{% endif -%} {% endif -%}
# Disable registration for the kubelet running on the master on GCE. Also disable # Disable registration for the kubelet running on the master on AWS, GCE, Vagrant. Also disable
# the debugging handlers (/run and /exec) to prevent arbitrary code execution on # the debugging handlers (/run and /exec) to prevent arbitrary code execution on
# the master. # the master.
# TODO(roberthbailey): Make this configurable via an env var in config-default.sh # TODO(roberthbailey): Make this configurable via an env var in config-default.sh
{% set debugging_handlers = "--enable-debugging-handlers=true" -%} {% set debugging_handlers = "--enable-debugging-handlers=true" -%}
{% if grains.cloud in ['gce', 'vagrant'] -%} {% if grains.cloud in ['aws', 'gce', 'vagrant'] -%}
{% if grains['roles'][0] == 'kubernetes-master' -%} {% if grains['roles'][0] == 'kubernetes-master' -%}
{% set api_servers_with_port = "" -%} {% set api_servers_with_port = "" -%}
{% set debugging_handlers = "--enable-debugging-handlers=false" -%} {% set debugging_handlers = "--enable-debugging-handlers=false" -%}