github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7678 from justinsb/aws_api_on_443

Browse Source 
AWS: Change apiserver to listen on 443 directly, not through nginx
This commit is contained in:
Robert Bailey
2015-05-04 13:52:57 -07:00
parent f1666dacd6 57f7b658bb
commit e3ff2dc02d
6 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest
View File

@@ -46,7 +46,7 @@
{% set client_ca_file = "" -%}
{% set secure_port = "6443" -%}
{% if grains['cloud'] is defined and grains['cloud'] == 'gce' %}
{% if grains['cloud'] is defined and grains.cloud in [ 'aws', 'gce' ] %}
{% set secure_port = "443" -%}
{% set client_ca_file = "--client_ca_file=/srv/kubernetes/ca.crt" -%}
{% endif -%}
@@ -60,7 +60,7 @@
{% endif -%}
{% endif -%}
{% if grains['cloud'] is defined and grains['cloud'] == 'gce' %}
{% if grains['cloud'] is defined and grains.cloud in [ 'aws', 'gce' ] %}
{% set basic_auth_file = "--basic_auth_file=/srv/kubernetes/basic_auth.csv" -%}
{% endif -%}