Skip to content

Commit 048f338

Browse files
mate4stmoadqassem
andauthored
[release/v1.45] Enable setup.service and disable it after first run (#1355)
* enable setup.service and disable it after first run * adjust vsphere tests Signed-off-by: Moath Qasim <[email protected]> * use vsphere legacy preset Signed-off-by: Moath Qasim <[email protected]> Co-authored-by: Moath Qasim <[email protected]>
1 parent 2322ab4 commit 048f338

File tree

64 files changed

+151
-78
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+151
-78
lines changed

.prow.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,7 @@ presubmits:
550550
labels:
551551
preset-hetzner: "true"
552552
preset-e2e-ssh: "true"
553-
preset-vsphere: "true"
553+
preset-vsphere-legacy: "true"
554554
preset-rhel: "true"
555555
preset-goproxy: "true"
556556
spec:
@@ -794,7 +794,7 @@ presubmits:
794794
error_on_eviction: true
795795
clone_uri: "ssh://[email protected]/kubermatic/machine-controller.git"
796796
labels:
797-
preset-vsphere: "true"
797+
preset-vsphere-legacy: "true"
798798
preset-rhel: "true"
799799
preset-hetzner: "true"
800800
preset-e2e-ssh: "true"
@@ -817,7 +817,7 @@ presubmits:
817817
error_on_eviction: true
818818
clone_uri: "ssh://[email protected]/kubermatic/machine-controller.git"
819819
labels:
820-
preset-vsphere: "true"
820+
preset-vsphere-legacy: "true"
821821
preset-rhel: "true"
822822
preset-hetzner: "true"
823823
preset-e2e-ssh: "true"

pkg/userdata/amzn2/provider.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@ write_files:
234234
{{ end -}}
235235
systemctl enable --now kubelet
236236
systemctl enable --now --no-block kubelet-healthcheck.service
237+
systemctl disable setup.service
237238
238239
- path: "/opt/bin/supervise.sh"
239240
permissions: "0755"
@@ -315,5 +316,5 @@ write_files:
315316
{{- end }}
316317
317318
runcmd:
318-
- systemctl start setup.service
319+
- systemctl enable --now setup.service
319320
`

pkg/userdata/amzn2/testdata/containerd-kubelet-v1.20-aws.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ write_files:
173173
174174
systemctl enable --now kubelet
175175
systemctl enable --now --no-block kubelet-healthcheck.service
176+
systemctl disable setup.service
176177
177178
- path: "/opt/bin/supervise.sh"
178179
permissions: "0755"
@@ -435,4 +436,4 @@ write_files:
435436
436437
437438
runcmd:
438-
- systemctl start setup.service
439+
- systemctl enable --now setup.service

pkg/userdata/amzn2/testdata/kubelet-v1.20-aws.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ write_files:
170170
171171
systemctl enable --now kubelet
172172
systemctl enable --now --no-block kubelet-healthcheck.service
173+
systemctl disable setup.service
173174
174175
- path: "/opt/bin/supervise.sh"
175176
permissions: "0755"
@@ -415,4 +416,4 @@ write_files:
415416
416417
417418
runcmd:
418-
- systemctl start setup.service
419+
- systemctl enable --now setup.service

pkg/userdata/amzn2/testdata/kubelet-v1.21-aws-external.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ write_files:
170170
171171
systemctl enable --now kubelet
172172
systemctl enable --now --no-block kubelet-healthcheck.service
173+
systemctl disable setup.service
173174
174175
- path: "/opt/bin/supervise.sh"
175176
permissions: "0755"
@@ -415,4 +416,4 @@ write_files:
415416
416417
417418
runcmd:
418-
- systemctl start setup.service
419+
- systemctl enable --now setup.service

pkg/userdata/amzn2/testdata/kubelet-v1.21-aws.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ write_files:
170170
171171
systemctl enable --now kubelet
172172
systemctl enable --now --no-block kubelet-healthcheck.service
173+
systemctl disable setup.service
173174
174175
- path: "/opt/bin/supervise.sh"
175176
permissions: "0755"
@@ -415,4 +416,4 @@ write_files:
415416
416417
417418
runcmd:
418-
- systemctl start setup.service
419+
- systemctl enable --now setup.service

pkg/userdata/amzn2/testdata/kubelet-v1.21-vsphere-mirrors.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ write_files:
185185
systemctl enable --now vmtoolsd.service
186186
systemctl enable --now kubelet
187187
systemctl enable --now --no-block kubelet-healthcheck.service
188+
systemctl disable setup.service
188189
189190
- path: "/opt/bin/supervise.sh"
190191
permissions: "0755"
@@ -432,4 +433,4 @@ write_files:
432433
433434
434435
runcmd:
435-
- systemctl start setup.service
436+
- systemctl enable --now setup.service

pkg/userdata/amzn2/testdata/kubelet-v1.21-vsphere-proxy.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ write_files:
185185
systemctl enable --now vmtoolsd.service
186186
systemctl enable --now kubelet
187187
systemctl enable --now --no-block kubelet-healthcheck.service
188+
systemctl disable setup.service
188189
189190
- path: "/opt/bin/supervise.sh"
190191
permissions: "0755"
@@ -432,4 +433,4 @@ write_files:
432433
433434
434435
runcmd:
435-
- systemctl start setup.service
436+
- systemctl enable --now setup.service

pkg/userdata/amzn2/testdata/kubelet-v1.21-vsphere.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ write_files:
177177
systemctl enable --now vmtoolsd.service
178178
systemctl enable --now kubelet
179179
systemctl enable --now --no-block kubelet-healthcheck.service
180+
systemctl disable setup.service
180181
181182
- path: "/opt/bin/supervise.sh"
182183
permissions: "0755"
@@ -423,4 +424,4 @@ write_files:
423424
424425
425426
runcmd:
426-
- systemctl start setup.service
427+
- systemctl enable --now setup.service

pkg/userdata/amzn2/testdata/kubelet-v1.22-aws.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ write_files:
170170
171171
systemctl enable --now kubelet
172172
systemctl enable --now --no-block kubelet-healthcheck.service
173+
systemctl disable setup.service
173174
174175
- path: "/opt/bin/supervise.sh"
175176
permissions: "0755"
@@ -415,4 +416,4 @@ write_files:
415416
416417
417418
runcmd:
418-
- systemctl start setup.service
419+
- systemctl enable --now setup.service

0 commit comments

Comments
 (0)