-
Notifications
You must be signed in to change notification settings - Fork 38.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
aws cluster/kube-up.sh fixes #3970
Changes from all commits
bb0431d
d20188c
2f19557
993071d
8058632
bb406ce
3fb6191
51225c7
5d864b0
eb1d9d0
d8791ac
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -27,6 +27,10 @@ | |
{% if grains.cloud == 'gce' -%} | ||
{% set cloud_provider = "--cloud_provider=gce" -%} | ||
{% endif -%} | ||
{% if grains.cloud == 'aws' -%} | ||
{% set cloud_provider = "--cloud_provider=aws" -%} | ||
{% set cloud_config = "--cloud_config=/etc/aws.conf" -%} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this broke Vagrant. In the future, please always set the initial value of a global variable to the empty string outside of an if-block. I think this would have also broke other providers. Will send a patch. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Sorry, my bad!
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ah, totally missed initializing cloud_config. Sorry. |
||
{% endif -%} | ||
{% endif -%} | ||
|
||
{% if pillar['portal_net'] is defined -%} | ||
|
@@ -40,7 +44,7 @@ | |
{% set token_auth_file = "--token_auth_file=/dev/null" -%} | ||
|
||
{% if grains.cloud is defined -%} | ||
{% if grains.cloud == 'gce' or grains.cloud == 'vagrant' -%} | ||
{% if grains.cloud in [ 'aws', 'gce', 'vagrant' ] -%} | ||
# TODO: generate and distribute tokens for other cloud providers. | ||
{% set token_auth_file = "--token_auth_file=/srv/kubernetes/known_tokens.csv" -%} | ||
{% endif -%} | ||
|
@@ -51,4 +55,4 @@ | |
{% set admission_control = "--admission_control=" + grains.admission_control -%} | ||
{% endif -%} | ||
|
||
DAEMON_ARGS="{{daemon_args}} {{address}} {{etcd_servers}} {{ cloud_provider }} {{admission_control}} --allow_privileged={{pillar['allow_privileged']}} {{portal_net}} {{cert_file}} {{key_file}} {{secure_port}} {{token_auth_file}} {{publicAddressOverride}} {{pillar['log_level']}}" | ||
DAEMON_ARGS="{{daemon_args}} {{address}} {{etcd_servers}} {{ cloud_provider }} {{ cloud_config }} {{admission_control}} --allow_privileged={{pillar['allow_privileged']}} {{portal_net}} {{cert_file}} {{key_file}} {{secure_port}} {{token_auth_file}} {{publicAddressOverride}} {{pillar['log_level']}}" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit:
((n++))