github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 07:20:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #47178 from ktsakalozos/bug/worker-labels

Browse Source 
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. 
```
This commit is contained in:
Kubernetes Submit Queue 2017-06-26 17:48:06 -07:00 committed by GitHub
commit 9a4a0cb31d
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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():