github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-12-07 09:43:15 +00:00
Code Issues Projects Releases Wiki Activity

add letters to source code to make native vsphere integration (reqs >= 1.12)

Browse Source
This commit is contained in:
Kevin W Monroe
2018-08-18 09:38:11 -05:00
committed by cdkbot
parent fed74b7299
commit 0687655c53
6 changed files with 58 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py
View File

@@ -714,6 +714,10 @@ def configure_kubelet(dns, ingress_ip):
cloud_config_path = _cloud_config_path('kubelet')
kubelet_opts['cloud-provider'] = 'openstack'
kubelet_opts['cloud-config'] = str(cloud_config_path)
elif is_state('endpoint.vsphere.ready'):
# vsphere doesnt need a cloud config on the worker
cloud_config_path = _cloud_config_path('kubelet')
kubelet_opts['cloud-provider'] = 'vsphere'
if get_version('kubelet') >= (1, 10):
# Put together the KubeletConfiguration data
@@ -1193,6 +1197,8 @@ def get_node_name():
cloud_provider = 'gce'
elif is_state('endpoint.openstack.ready'):
cloud_provider = 'openstack'
elif is_state('endpoint.vsphere.ready'):
cloud_provider = 'vsphere'
if cloud_provider == 'aws':
return getfqdn().lower()
else: