Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump alpine to 3.19 #1167

Merged
merged 2 commits into from Apr 10, 2024
Merged

Conversation

akalenyu
Copy link
Contributor

@akalenyu akalenyu commented Apr 4, 2024

What this PR does / why we need it:
Turns out the cloud-init-local service is now vital for cloud-init to work on Alpine:
https://leo.leung.xyz/wiki/Cloud-init
https://gitlab.com/redhat/centos-stream/rpms/cloud-init/-/blob/020655f489ca26b5830de8423354a14ccd0552db/cloud-init.spec#L138
I've double checked cloud-init breaks when I remove it.
(quay.io/akalenyu/alpine-cloud-init:3.19-broken vs quay.io/akalenyu/alpine-cloud-init:3.19)

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

Special notes for your reviewer:

Checklist

This checklist is not enforcing, but it's a reminder of items that could be relevant to every PR.
Approvers are expected to review this list.

Release note:

NONE

@kubevirt-bot kubevirt-bot added the dco-signoff: yes Indicates the PR's author has DCO signed all their commits. label Apr 4, 2024
andreabolognani added a commit to andreabolognani/kubevirt that referenced this pull request Apr 5, 2024
It comes with a newer kernel which implements a virtio-mem
driver that's compatible with the QEMU 8.2 device.

kubevirt/kubevirtci#1167

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
andreabolognani added a commit to andreabolognani/kubevirt that referenced this pull request Apr 5, 2024
It comes with a newer kernel which implements a virtio-mem
driver that's compatible with the QEMU 8.2 device.

kubevirt/kubevirtci#1167

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
@andreabolognani
Copy link

@akalenyu thank you again for your amazing work here! You really got us out of the rut we were stuck in.

I've tested the updated image and the NoCloud volume is finally being taken into consideration. However, we also need

diff --git a/cluster-provision/images/vm-image-builder/alpine-cloud-init/configure.sh b/cluster-provision/images/vm-image-builder/alpine-cloud-init/configure.sh
index f88e0265..4e3b7656 100755
--- a/cluster-provision/images/vm-image-builder/alpine-cloud-init/configure.sh
+++ b/cluster-provision/images/vm-image-builder/alpine-cloud-init/configure.sh
@@ -25,4 +25,5 @@ rc-update add cloud-init default
 rc-update add cloud-init-local default
 rc-update add cloud-config default
 rc-update add cloud-final default
+rc-update add networking default
 rc-update add sshd default

otherwise the network interfaces will not be brought up.

@@ -24,7 +24,7 @@ docker run --rm --platform=$PLATFORM -v /lib/modules:/lib/modules -v /dev:/dev -
./alpine-make-vm-image \
--image-format qcow2 \
--image-size 200M \
--branch v3.16 \

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please fix the alignment while you're at it? It really bugs me that this line doesn't sit flush with the surrounding ones O:-)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sure, done

Signed-off-by: Alex Kalenyuk <akalenyu@redhat.com>
Otherwise, the network interfaces will not be brought up:
kubevirt/kubevirt#11256 (comment)

Signed-off-by: Alex Kalenyuk <akalenyu@redhat.com>
@akalenyu
Copy link
Contributor Author

akalenyu commented Apr 7, 2024

@akalenyu thank you again for your amazing work here! You really got us out of the rut we were stuck in.

I've tested the updated image and the NoCloud volume is finally being taken into consideration. However, we also need

diff --git a/cluster-provision/images/vm-image-builder/alpine-cloud-init/configure.sh b/cluster-provision/images/vm-image-builder/alpine-cloud-init/configure.sh
index f88e0265..4e3b7656 100755
--- a/cluster-provision/images/vm-image-builder/alpine-cloud-init/configure.sh
+++ b/cluster-provision/images/vm-image-builder/alpine-cloud-init/configure.sh
@@ -25,4 +25,5 @@ rc-update add cloud-init default
 rc-update add cloud-init-local default
 rc-update add cloud-config default
 rc-update add cloud-final default
+rc-update add networking default
 rc-update add sshd default

otherwise the network interfaces will not be brought up.

thanks, done
wonder what changed now, that made us have to do it explicitly

@kubevirt-bot
Copy link
Contributor

kubevirt-bot commented Apr 7, 2024

@akalenyu: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
check-up-kind-1.27-vgpu eb91f85 link false /test check-up-kind-1.27-vgpu

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@andreabolognani
Copy link

/lgtm

@kubevirt-bot kubevirt-bot added the lgtm Indicates that a PR is ready to be merged. label Apr 8, 2024
andreabolognani added a commit to andreabolognani/kubevirt that referenced this pull request Apr 8, 2024
It comes with a newer kernel which implements a virtio-mem
driver that's compatible with the QEMU 8.2 device.

kubevirt/kubevirtci#1167

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
andreabolognani added a commit to andreabolognani/kubevirt that referenced this pull request Apr 8, 2024
It comes with a newer kernel which implements a virtio-mem
driver that's compatible with the QEMU 8.2 device.

kubevirt/kubevirtci#1167

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
@andreabolognani
Copy link

Can this be moved forward? My PR that needs it (kubevirt/kubevirt#11256) is waiting for some changes on the CentOS Stream side, but we could do the bump to Alpine 3.19 in KubeVirt separately in the meantime, sort of get ahead of the game in a sense...

@akalenyu
Copy link
Contributor Author

Can this be moved forward? My PR that needs it (kubevirt/kubevirt#11256) is waiting for some changes on the CentOS Stream side, but we could do the bump to Alpine 3.19 in KubeVirt separately in the meantime, sort of get ahead of the game in a sense...

/cc @dhiller

Copy link
Contributor

@dhiller dhiller left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/approve

Thanks @akalenyu !

@kubevirt-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dhiller

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kubevirt-bot kubevirt-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 10, 2024
@dhiller
Copy link
Contributor

dhiller commented Apr 10, 2024

/test check-provision-k8s-1.30

@dhiller
Copy link
Contributor

dhiller commented Apr 10, 2024

^^ looked like a hiccup

@kubevirt-commenter-bot
Copy link

/retest-required
This bot automatically retries required jobs that failed/flaked on approved PRs.
Silence the bot with an /lgtm cancel or /hold comment for consistent failures.

@kubevirt-bot kubevirt-bot merged commit ef69592 into kubevirt:main Apr 10, 2024
9 of 10 checks passed
@andreabolognani
Copy link

@akalenyu @dhiller I don't see an updated image at https://quay.io/repository/kubevirtci/alpine-with-test-tooling-container-disk?tab=tags, does a job need to be kicked off manually or something?

@akalenyu
Copy link
Contributor Author

@akalenyu @dhiller I don't see an updated image at https://quay.io/repository/kubevirtci/alpine-with-test-tooling-container-disk?tab=tags, does a job need to be kicked off manually or something?

There should be a tag containing this commit in
https://github.com/kubevirt/kubevirtci/tags
(which would also handle publishing the alpine img, IIUC)
But for some reason quite some time passed and this didn't happen

@andreabolognani
Copy link

Still no image AFAICT...

@dhiller
Copy link
Contributor

dhiller commented Apr 19, 2024

Still no image AFAICT...

Hey @akalenyu @andreabolognani image should be there now - latest image tag is 2404181910-1c58677

@andreabolognani
Copy link

@dhiller yup, it's there now. Thanks a lot! For future reference, how did you make it happen? Did some automation need to be fixed, some job need to be kicked off manually, something else...

andreabolognani added a commit to andreabolognani/kubevirt that referenced this pull request Apr 19, 2024
It comes with a newer kernel which implements a virtio-mem
driver that's compatible with the QEMU 8.2 device.

kubevirt/kubevirtci#1167

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
andreabolognani added a commit to andreabolognani/kubevirt that referenced this pull request Apr 23, 2024
It comes with a newer kernel which implements a virtio-mem
driver that's compatible with the QEMU 8.2 device.

kubevirt/kubevirtci#1167

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
kubevirt-bot added a commit to kubevirt-bot/kubevirt that referenced this pull request Apr 23, 2024
[8f203b9 Automatic bump of CentOS Stream to latest](kubevirt/kubevirtci#1181)
[5d854e0 centos9: Add --numa support to vm.sh](kubevirt/kubevirtci#1174)
[73b90a3 Run bazelisk run //robots/cmd/kubevirtci-bumper:kubevirtci-bumper -- -ensure-last-three-minor-of v1 --k8s-provider-dir /home/prow/go/src/github.com/kubevirt/project-infra/../kubevirtci/cluster-provision/k8s](kubevirt/kubevirtci#1175)
[1c58677 Remove NoSchedule taints for control-planes as well as masters](kubevirt/kubevirtci#1173)
[9d50baf Automatic bump of CentOS Stream to latest](kubevirt/kubevirtci#1168)
[ef69592 Bump alpine to 3.19](kubevirt/kubevirtci#1167)
[4c6d7c7 Add AAQ Operator as an optional cluster addon](kubevirt/kubevirtci#1170)
[d69cd4e Automatic bump of CentOS Stream to latest](kubevirt/kubevirtci#1166)
[62457f2 Automatic bump of CentOS Stream to latest](kubevirt/kubevirtci#1162)
[85d8a72 centos: Update centos stream base to 20240318.0](kubevirt/kubevirtci#1161)
[970d172 Bump github.com/docker/docker in /cluster-provision/gocli](kubevirt/kubevirtci#1159)

```release-note
NONE
```

Signed-off-by: kubevirt-bot <kubevirtbot@redhat.com>
victortoso pushed a commit to victortoso/kubevirt that referenced this pull request Apr 23, 2024
It comes with a newer kernel which implements a virtio-mem
driver that's compatible with the QEMU 8.2 device.

kubevirt/kubevirtci#1167

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
victortoso pushed a commit to victortoso/kubevirt that referenced this pull request Apr 30, 2024
It comes with a newer kernel which implements a virtio-mem
driver that's compatible with the QEMU 8.2 device.

kubevirt/kubevirtci#1167

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
victortoso pushed a commit to victortoso/kubevirt that referenced this pull request May 2, 2024
It comes with a newer kernel which implements a virtio-mem
driver that's compatible with the QEMU 8.2 device.

kubevirt/kubevirtci#1167

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
andreabolognani added a commit to andreabolognani/kubevirt that referenced this pull request May 7, 2024
It comes with a newer kernel which implements a virtio-mem
driver that's compatible with the QEMU 8.2 device.

kubevirt/kubevirtci#1167

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. lgtm Indicates that a PR is ready to be merged. size/S
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants