Skip to content

Commit 67a9f7f

Browse files
committed
kubeadm: dont handle cmds twice
1 parent c078820 commit 67a9f7f

3 files changed

Lines changed: 6 additions & 12 deletions

File tree

kvirt/cluster/kubeadm/bootstrap.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
{% set extra_disks = extra_ctlplane_disks %}
66
{% endif %}
77

8-
{% set all_cmds = cmds|default([]) %}
9-
{% do all_cmds.append("bash /root/deploy.sh") %}
10-
118
{{ cluster }}-ctlplane-0:
129
{% set primary_network = {'name': network} %}
1310
{% if config_type in ['aws', 'azure', 'gcp', 'hcloud', 'ibm'] %}
@@ -60,4 +57,5 @@
6057
origin: 90-flannel.rules
6158
{% endif %}
6259
- registry.yml
63-
cmds: {{ all_cmds }}
60+
cmds:
61+
- bash /root/deploy.sh

kvirt/cluster/kubeadm/ctlplanes.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77
{% set extra_disks = extra_ctlplane_disks %}
88
{% endif %}
99

10-
{% set all_cmds = cmds|default([]) %}
11-
{% do all_cmds.append("bash /root/deploy.sh") %}
12-
1310
{{ cluster }}-ctlplane-{{ number }}:
1411
{% set primary_network = {'name': network} %}
1512
image: {{ image }}
@@ -47,5 +44,6 @@
4744
- path: /etc/udev/rules.d/90-flannel.rules
4845
origin: 90-flannel.rules
4946
{% endif %}
50-
cmds: {{ all_cmds }}
47+
cmds:
48+
- bash /root/deploy.sh
5149
{% endfor %}

kvirt/cluster/kubeadm/workers.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
{% set extra_disks = extra_worker_disks %}
77
{% endif %}
88

9-
{% set all_cmds = cmds|default([]) %}
10-
{% do all_cmds.append("bash /root/deploy.sh") %}
11-
129
{{cluster }}-worker-{{ number }}:
1310
image: {{ image }}
1411
pool: {{ pool or config_pool }}
@@ -39,5 +36,6 @@
3936
- path: /etc/udev/rules.d/90-flannel.rules
4037
origin: 90-flannel.rules
4138
{% endif %}
42-
cmds: {{ all_cmds }}
39+
cmds:
40+
- bash /root/deploy.sh
4341
{% endfor %}

0 commit comments

Comments
 (0)