mirror of
https://github.com/kubernetes-sigs/kubespray.git
synced 2026-02-16 02:30:03 -03:30
remove unused code (#4981)
This commit is contained in:
committed by
Kubernetes Prow Robot
parent
99c5f7e013
commit
de9443a694
@@ -1,17 +1,11 @@
|
||||
[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 %}
|
||||
|
||||
@@ -4,22 +4,7 @@ password = "{{ vsphere_password }}"
|
||||
port = {{ vsphere_vcenter_port }}
|
||||
insecure-flag = {{ vsphere_insecure }}
|
||||
|
||||
{% if kube_version is version('v1.9.2', '>=') %}
|
||||
datacenters = "{{ vsphere_datacenter }}"
|
||||
{% else %}
|
||||
datastore = "{{ vsphere_datastore }}"
|
||||
datacenter = "{{ vsphere_datacenter }}"
|
||||
working-dir = "{{ vsphere_working_dir }}"
|
||||
server = "{{ vsphere_vcenter_ip }}"
|
||||
{% if vsphere_vm_uuid is defined and vsphere_vm_uuid != "" %}
|
||||
vm-uuid = "{{ vsphere_vm_uuid }}"
|
||||
{% endif %}
|
||||
{% if vsphere_vm_name is defined and vsphere_vm_name != "" %}
|
||||
vm-name = "{{ vsphere_vm_name }}"
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
{% if kube_version is version('v1.9.2', '>=') %}
|
||||
|
||||
[VirtualCenter "{{ vsphere_vcenter_ip }}"]
|
||||
|
||||
@@ -32,7 +17,6 @@ default-datastore = "{{ vsphere_datastore }}"
|
||||
{% if vsphere_resource_pool is defined and vsphere_resource_pool != "" %}
|
||||
resourcepool-path = "{{ vsphere_resource_pool }}"
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
|
||||
[Disk]
|
||||
@@ -43,7 +27,6 @@ scsicontrollertype = {{ vsphere_scsi_controller_type }}
|
||||
public-network = {{ vsphere_public_network }}
|
||||
{% endif %}
|
||||
|
||||
{% if kube_version is version('v1.12.0', '>=') %}
|
||||
[Labels]
|
||||
{% if vsphere_zone_category is defined and vsphere_zone_category != "" %}
|
||||
zone = {{ vsphere_zone_category }}
|
||||
@@ -51,4 +34,3 @@ zone = {{ vsphere_zone_category }}
|
||||
{% if vsphere_region_category is defined and vsphere_region_category != "" %}
|
||||
region = {{ vsphere_region_category }}
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
@@ -13,9 +13,7 @@ spec:
|
||||
dnsPolicy: ClusterFirstWithHostNet
|
||||
nodeSelector:
|
||||
beta.kubernetes.io/os: linux
|
||||
{% if kube_version is version('v1.11.1', '>=') %}
|
||||
priorityClassName: system-node-critical
|
||||
{% endif %}
|
||||
containers:
|
||||
- name: haproxy
|
||||
image: {{ haproxy_image_repo }}:{{ haproxy_image_tag }}
|
||||
|
||||
@@ -13,9 +13,7 @@ spec:
|
||||
dnsPolicy: ClusterFirstWithHostNet
|
||||
nodeSelector:
|
||||
beta.kubernetes.io/os: linux
|
||||
{% if kube_version is version('v1.11.1', '>=') %}
|
||||
priorityClassName: system-node-critical
|
||||
{% endif %}
|
||||
containers:
|
||||
- name: nginx-proxy
|
||||
image: {{ nginx_image_repo }}:{{ nginx_image_tag }}
|
||||
|
||||
Reference in New Issue
Block a user