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 uuid bits to master/worker to make it a bit easier on operators

Browse Source
This commit is contained in:
Kevin W Monroe
2018-08-20 05:20:59 +00:00
committed by cdkbot
parent 0687655c53
commit 809dc2c763
2 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -714,10 +714,15 @@ 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
elif is_state('endpoint.vsphere.joined'):
# vsphere just needs to be joined on the worker (vs 'ready')
cloud_config_path = _cloud_config_path('kubelet')
kubelet_opts['cloud-provider'] = 'vsphere'
# NB: vsphere maps node product-id to its uuid (no config file needed).
uuid_file = '/sys/class/dmi/id/product_uuid'
with open(uuid_file, 'r') as f:
uuid = f.read().strip()
kubelet_opts['provider-id'] = 'vsphere://{}'.format(uuid)
if get_version('kubelet') >= (1, 10):
# Put together the KubeletConfiguration data