Skip to content

Commit 66c2598

Browse files
committed
K8S-556 worker annotations and labels
1 parent 1c0a955 commit 66c2598

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

addons/upgrade.jps

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,7 @@ actions:
345345
systemctl enable kubelet.service
346346
- cmd[${nodes.k8sm.master.id}]: |-
347347
/usr/bin/kubectl uncordon ${this.hostname} || exit 5
348+
/usr/local/sbin/worker-config -n ${this.id} -g cp -r ${env.region}
348349
while true; do echo "$(kubectl get pods --field-selector=status.phase=Pending -n kube-system)" | grep -q Pending || break; sleep 3; done
349350

350351
success:

manifest.jps

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ onInstall:
3131
- init-main-master
3232
- init-slave-masters
3333
- connect-workers: cp
34-
- apply-worker-integration: cp
34+
- apply-worker-config: ${nodes.cp.join(id,)}
3535
- setup-overlay
3636
- if ('${settings.ingress-controller}' == 'Nginx'):
3737
- setGlobals:
@@ -91,7 +91,7 @@ onAfterScaleOut[cp]:
9191
- prepare-worker-integration
9292
- cmd [${this.nodes}]: init-instance.sh --type=worker --initial=true --base-url=$(echo '${baseUrl}' | base64 -w 0)
9393
- connect-workers: ${this.nodes}
94-
- apply-worker-integration: ${this.nodes}
94+
- apply-worker-config: ${this.nodes}
9595
- if ('${this.ips}'):
9696
cmd[${nodes.k8sm.master.id}]: metallb-config -a '${this.ips}'
9797

@@ -171,7 +171,8 @@ actions:
171171
- setGlobals:
172172
worker_integration: ${response.out}
173173

174-
apply-worker-integration:
174+
apply-worker-config:
175+
- cmd[${nodes.k8sm.master.id}]: screen -d -m /usr/local/sbin/worker-config -n ${this} -g cp -r ${env.region}
175176
- cmd[${this}]: |-
176177
mkdir /var/lib/worker &>/dev/null || rm -rf /var/lib/worker/*
177178
echo '${globals.worker_integration}' | base64 -d | tar zxv --strip-components=4 -C /var/lib/worker

0 commit comments

Comments
 (0)