epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-03-10 12:18:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add Kubelet config, remove deprecated flags and fix minor bugs (#4724)

Browse Source 
* Add kubelet config

* Change kubelet_authorization_mode_webhook to true

* Fix lint

* Sync env file

* Refactor the kubernetes node folder

* Remove deprecated flag and fix lint
This commit is contained in:
Andreas Krüger
2019-05-08 22:38:36 +02:00
committed by Kubernetes Prow Robot
parent 8a5eae94ea
commit 044dcbaed0
22 changed files with 221 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
roles/kubernetes/node/templates/cloud-configs/aws-cloud-config.j2 Normal file
View File

@@ -0,0 +1,17 @@
[Global]
{% if kube_version is version('v1.6', '>=') %}
zone={{ aws_zone|default("") }}
vpc={{ aws_vpc|default("") }}
subnetId={{ aws_subnet_id|default("") }}
routeTableId={{ aws_route_table_id|default("") }}
{% if kube_version is version('v1.10', '>=') %}
roleArn={{ aws_role_arn|default("") }}
{% endif %}
kubernetesClusterTag={{ aws_kubernetes_cluster_tag|default("") }}
kubernetesClusterId={{ aws_kubernetes_cluster_id|default("") }}
disableSecurityGroupIngress={{ "true" if aws_disable_security_group_ingress|default(False) else "false" }}
disableStrictZoneCheck={{ "true" if aws_disable_strict_zone_check|default(False) else "false" }}
{% if kube_version is version('v1.7', '>=') %}
elbSecurityGroup={{ aws_elb_security_group|default("") }}
{% endif %}
{% endif %}