mirror of https://github.com/k3s-io/k3s
Merge pull request #47178 from ktsakalozos/bug/worker-labels
Automatic merge from submit-queue (batch tested with PRs 48012, 47443, 47702, 47178) Fix setting juju worker labels during deployment **What this PR does / why we need it**: Allows for setting the labels of juju workers during deployment (eg inside a bundle) **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #47176 **Special notes for your reviewer**: **Release note**: ``` Fix bug in setting Juju kubernetes-worker labels in bundle.yaml files. ```pull/6/head
commit
9a4a0cb31d
|
@ -328,6 +328,7 @@ def start_worker(kube_api, kube_control, cni):
|
|||
set_state('kubernetes-worker.config.created')
|
||||
restart_unit_services()
|
||||
update_kubelet_status()
|
||||
apply_node_labels()
|
||||
remove_state('kubernetes-worker.restart-needed')
|
||||
|
||||
|
||||
|
@ -415,7 +416,7 @@ def apply_node_labels():
|
|||
|
||||
# Atomically set a label
|
||||
for label in user_labels:
|
||||
_apply_node_label(label)
|
||||
_apply_node_label(label, overwrite=True)
|
||||
|
||||
|
||||
def arch():
|
||||
|
|
Loading…
Reference in New Issue