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

Upgrade SR-IOV provider nodes image to k8s-1.22 #694

Merged
merged 1 commit into from
Oct 21, 2021

Conversation

ormergi
Copy link
Contributor

@ormergi ormergi commented Oct 20, 2021

What this PR does / why we need it:
Following kubernetes-sigs/kind#2318, kubernetes-sigs/kind#2321 and kubernetes-sigs/kind#2465

The new KinD k8s-1.22 nodes image includes all the necessary changes that allows us to finally stop using PodPresets, upgrade k8s above 1.19 and still support Kubevirt Live Migration!

Thanks to @qinqon for his contribution to KinD upstream that allowed this to happen 👑

Note to reviewers:
PodPreset related files are not delete yet, it seems that the GPU providers uses it.

Signed-off-by: Or Mergi [email protected]

@kubevirt-bot kubevirt-bot added dco-signoff: yes Indicates the PR's author has DCO signed all their commits. size/L labels Oct 20, 2021
@kubevirt-bot kubevirt-bot requested a review from phoracek October 20, 2021 12:18
@ormergi
Copy link
Contributor Author

ormergi commented Oct 20, 2021

/cc @qinqon @EdDev @phoracek

@ormergi
Copy link
Contributor Author

ormergi commented Oct 20, 2021

@dhiller @vladikr Hey I noticed that the GPU provider also uses PodPreset, do we have GPU migration tests?
If it safe to upgrade it to k8s-1.22, we can remove the related code as well.

@@ -19,7 +19,7 @@ SRIOV_TESTS_NS="${SRIOV_TESTS_NS:-kubevirt-test-default1}"

function set_kind_params() {
export KIND_VERSION="${KIND_VERSION:-0.11.1}"
export KIND_NODE_IMAGE="${KIND_NODE_IMAGE:-quay.io/kubevirtci/kindest_node:v1.19.11@sha256:cbecc517bfad65e368cd7975d1e8a4f558d91160c051d0b1d10ff81488f5fb06}"
export KIND_NODE_IMAGE="${KIND_NODE_IMAGE:-kindest/node:v1.22.2@sha256:f638a08c1f68fe2a99e724ace6df233a546eaf6713019a0b310130a4f91ebe7f}"
Copy link
Contributor

Choose a reason for hiding this comment

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

We have to point to quay, can you work with @fgimenez to push it and then we change this PR ?

Copy link
Contributor

Choose a reason for hiding this comment

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

Sure, it is already available at quay.io/kubevirtci/kindest_node:v1.22.2@sha256:f638a08c1f68fe2a99e724ace6df233a546eaf6713019a0b310130a4f91ebe7f

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@fgimenez Thank you 🙂
I updated the image

Copy link
Contributor Author

@ormergi ormergi Oct 20, 2021

Choose a reason for hiding this comment

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

@fgimenez Wait does mirroring to quay.io/kubevirt is done automaticly now? 😮

Copy link
Contributor

Choose a reason for hiding this comment

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

Nope I did it manually 🤖

@@ -19,7 +19,7 @@ SRIOV_TESTS_NS="${SRIOV_TESTS_NS:-kubevirt-test-default1}"

function set_kind_params() {
export KIND_VERSION="${KIND_VERSION:-0.11.1}"
export KIND_NODE_IMAGE="${KIND_NODE_IMAGE:-quay.io/kubevirtci/kindest_node:v1.19.11@sha256:cbecc517bfad65e368cd7975d1e8a4f558d91160c051d0b1d10ff81488f5fb06}"
export KIND_NODE_IMAGE="${KIND_NODE_IMAGE:-kindest/node:v1.22.2@sha256:f638a08c1f68fe2a99e724ace6df233a546eaf6713019a0b310130a4f91ebe7f}"
Copy link
Contributor

Choose a reason for hiding this comment

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

We have to point to quay, can you work with @fgimenez to push it and then we change this PR ?

@ormergi
Copy link
Contributor Author

ormergi commented Oct 20, 2021

Created PR on project-infra to update KubevirtCI SR-IOV check up lane to use the upgraded provider
kubevirt/project-infra#1685

Also created PR for testing the upgraded provider with kubevirt/project-infra#1685:
kubevirt/project-infra#1686

The new KinD k8s-1.22 nodes includes a change [1] [2] that allows us
to stop using PodPresets and still support Kubevirt Live Migration.

[1] kubernetes-sigs/kind#2465
[2] kubernetes-sigs/kind#2321

Signed-off-by: Or Mergi <[email protected]>
@ormergi ormergi force-pushed the upgrade-sriov-provider branch from b172efb to c9e5d95 Compare October 20, 2021 13:04
@ormergi
Copy link
Contributor Author

ormergi commented Oct 20, 2021

/test check-up-kind-1.22-sriov

@ormergi
Copy link
Contributor Author

ormergi commented Oct 20, 2021

/test check-provision-k8s-1.19
/test check-provision-k8s-1.22

@ormergi
Copy link
Contributor Author

ormergi commented Oct 20, 2021

@qinqon @fgimenez the updated check-up job has passed
https://prow.ci.kubevirt.io/view/gs/kubevirt-prow/pr-logs/pull/kubevirt_kubevirtci/694/check-up-kind-1.22-sriov/1450826429464842240
If there are no changes to do could you please approve it?

Copy link
Contributor

@fgimenez fgimenez 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!

@kubevirt-bot kubevirt-bot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Oct 20, 2021
@kubevirt-commenter-bot
Copy link

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

@ormergi
Copy link
Contributor Author

ormergi commented Oct 20, 2021

/hold
@qinqon I am placing a hold because I am not sure if you have other changes you would like to ask

@kubevirt-bot kubevirt-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 20, 2021
Copy link
Contributor

@qinqon qinqon left a comment

Choose a reason for hiding this comment

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

Let's remove the 1.19 references.

## Setting a custom kind version

In order to use a custom kind image / kind version, export `KIND_NODE_IMAGE`, `KIND_VERSION`, `KUBECTL_PATH` before
running cluster-up. For example in order to use kind 0.9.0 (which is based on k8s-1.19.1) use:
Copy link
Contributor

Choose a reason for hiding this comment

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

There are some 1.19 eferences.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I didn't remove that one because its describe how to use different versions of Kind and node images
Since we use the latest I think it make sense to leave it like this

Copy link
Contributor

Choose a reason for hiding this comment

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

fair enough

@qinqon
Copy link
Contributor

qinqon commented Oct 21, 2021

/lgtm
/approve

@kubevirt-bot kubevirt-bot added the lgtm Indicates that a PR is ready to be merged. label Oct 21, 2021
@kubevirt-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fgimenez, qinqon

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

@ormergi
Copy link
Contributor Author

ormergi commented Oct 21, 2021

Thank you all :)

/unhold

@kubevirt-bot kubevirt-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 21, 2021
@kubevirt-bot kubevirt-bot merged commit bf9b729 into kubevirt:main Oct 21, 2021
kubevirt-bot added a commit to kubevirt-bot/kubevirt that referenced this pull request Oct 21, 2021
[bf9b729 Upgrade SR-IOV provider nodes image to k8s-1.22](kubevirt/kubevirtci#694)
[5a10f48 Add check-cluster-up script for KinD providers](kubevirt/kubevirtci#645)

Signed-off-by: kubevirt-bot <[email protected]>
kubevirt-bot added a commit to kubevirt-bot/kubevirt that referenced this pull request Oct 22, 2021
[bf9b729 Upgrade SR-IOV provider nodes image to k8s-1.22](kubevirt/kubevirtci#694)
[5a10f48 Add check-cluster-up script for KinD providers](kubevirt/kubevirtci#645)

Signed-off-by: kubevirt-bot <[email protected]>
kubevirt-bot added a commit to kubevirt-bot/kubevirt that referenced this pull request Oct 22, 2021
[bf9b729 Upgrade SR-IOV provider nodes image to k8s-1.22](kubevirt/kubevirtci#694)
[5a10f48 Add check-cluster-up script for KinD providers](kubevirt/kubevirtci#645)

Signed-off-by: kubevirt-bot <[email protected]>
kubevirt-bot added a commit to kubevirt-bot/kubevirt that referenced this pull request Oct 23, 2021
[bf9b729 Upgrade SR-IOV provider nodes image to k8s-1.22](kubevirt/kubevirtci#694)
[5a10f48 Add check-cluster-up script for KinD providers](kubevirt/kubevirtci#645)

Signed-off-by: kubevirt-bot <[email protected]>
kubevirt-bot added a commit to kubevirt-bot/kubevirt that referenced this pull request Oct 23, 2021
[bf9b729 Upgrade SR-IOV provider nodes image to k8s-1.22](kubevirt/kubevirtci#694)
[5a10f48 Add check-cluster-up script for KinD providers](kubevirt/kubevirtci#645)

Signed-off-by: kubevirt-bot <[email protected]>
kubevirt-bot added a commit to kubevirt-bot/kubevirt that referenced this pull request Oct 24, 2021
[bf9b729 Upgrade SR-IOV provider nodes image to k8s-1.22](kubevirt/kubevirtci#694)
[5a10f48 Add check-cluster-up script for KinD providers](kubevirt/kubevirtci#645)

Signed-off-by: kubevirt-bot <[email protected]>
kubevirt-bot added a commit to kubevirt-bot/kubevirt that referenced this pull request Oct 24, 2021
[bf9b729 Upgrade SR-IOV provider nodes image to k8s-1.22](kubevirt/kubevirtci#694)
[5a10f48 Add check-cluster-up script for KinD providers](kubevirt/kubevirtci#645)

Signed-off-by: kubevirt-bot <[email protected]>
kubevirt-bot added a commit to kubevirt-bot/kubevirt that referenced this pull request Oct 25, 2021
[bf9b729 Upgrade SR-IOV provider nodes image to k8s-1.22](kubevirt/kubevirtci#694)
[5a10f48 Add check-cluster-up script for KinD providers](kubevirt/kubevirtci#645)

Signed-off-by: kubevirt-bot <[email protected]>
ormergi added a commit to ormergi/project-infra that referenced this pull request Oct 25, 2021
Following kubevirt/kubevirtci#694, create new periodic lane
for the new provider.

Also, adjust kubevirt kind-1.19-sriov periodic job to use k8s-1.19
nodes image explicitly since the old provider files are gone.
Once we see the new periodic job is stable we can remove the old one.

Signed-off-by: Or Mergi <[email protected]>
ormergi added a commit to ormergi/project-infra that referenced this pull request Oct 25, 2021
Following kubevirt/kubevirtci#694, create new presubmits jobs
for the new provider.

Also, adjust kubevirt kind-1.19-sriov presubmits jobs to use
k8s-1.19 nodes image explicitly since the old provider files are gone.
Once we see pull-kubevirt-e2e-kind-1.22-sriov job is stable we can
remove the old one.

Signed-off-by: Or Mergi <[email protected]>
ormergi added a commit to ormergi/project-infra that referenced this pull request Oct 25, 2021
Following kubevirt/kubevirtci#694, create periodic job or the
new provider.

Once we see the new periodic job is stable we can remove the old one.

Signed-off-by: Or Mergi <[email protected]>
ormergi added a commit to ormergi/project-infra that referenced this pull request Oct 25, 2021
Following kubevirt/kubevirtci#694, create presubmits jobs for
the new provider.

Once we see 'periodic-kubevirt-e2e-k8s-1.22-sriov' job is stable
we can set it as mandatory and remove the old one.

Signed-off-by: Or Mergi <[email protected]>
ormergi added a commit to ormergi/project-infra that referenced this pull request Oct 25, 2021
Following kubevirt/kubevirtci#694, create presubmits jobs for
the new provider.

Once we see 'periodic-kubevirt-e2e-k8s-1.22-sriov' job is stable
we can set it as mandatory and remove the old one.

Signed-off-by: Or Mergi <[email protected]>
kubevirt-bot added a commit to kubevirt-bot/kubevirt that referenced this pull request Oct 25, 2021
[bf9b729 Upgrade SR-IOV provider nodes image to k8s-1.22](kubevirt/kubevirtci#694)
[5a10f48 Add check-cluster-up script for KinD providers](kubevirt/kubevirtci#645)

Signed-off-by: kubevirt-bot <[email protected]>
ormergi added a commit to ormergi/project-infra that referenced this pull request Oct 25, 2021
Following kubevirt/kubevirtci#694, create periodic job or the
new provider.
The new job will be scheduled 40 minutes after kind-1.19-sriov
job.

Once we see the new periodic job is stable we can remove the old one.

Signed-off-by: Or Mergi <[email protected]>
ormergi added a commit to ormergi/project-infra that referenced this pull request Oct 25, 2021
Following kubevirt/kubevirtci#694, create presubmits jobs for
the new provider.

Once we see 'periodic-kubevirt-e2e-k8s-1.22-sriov' job is stable
we can set it as mandatory and remove the old one.

Signed-off-by: Or Mergi <[email protected]>
ormergi added a commit to ormergi/project-infra that referenced this pull request Oct 25, 2021
Following kubevirt/kubevirtci#694, create periodic job or the
new provider.
The new job will be scheduled 40 minutes after kind-1.19-sriov
job.

Once we see the new periodic job is stable we can remove the old one.

Signed-off-by: Or Mergi <[email protected]>
ormergi added a commit to ormergi/project-infra that referenced this pull request Oct 25, 2021
Following kubevirt/kubevirtci#694, create presubmits jobs for
the new provider.

Once we see 'periodic-kubevirt-e2e-k8s-1.22-sriov' job is stable
we can set it as mandatory and remove the old one.

Signed-off-by: Or Mergi <[email protected]>
kubevirt-bot added a commit to kubevirt-bot/kubevirt that referenced this pull request Oct 26, 2021
[8198e9c sync provider.sh between kind and kind-sriov](kubevirt/kubevirtci#587)
[8b1d599 Restore kind-1.19-sriov provider files](kubevirt/kubevirtci#695)
[bf9b729 Upgrade SR-IOV provider nodes image to k8s-1.22](kubevirt/kubevirtci#694)
[5a10f48 Add check-cluster-up script for KinD providers](kubevirt/kubevirtci#645)

Signed-off-by: kubevirt-bot <[email protected]>
kubevirt-bot pushed a commit to kubevirt/project-infra that referenced this pull request Oct 27, 2021
* prow, kubevirt periodics: Add new job for kind-1.22-sriov

Following kubevirt/kubevirtci#694, create periodic job or the
new provider.
The new job will be scheduled 40 minutes after kind-1.19-sriov
job.

Once we see the new periodic job is stable we can remove the old one.

Signed-off-by: Or Mergi <[email protected]>

* prow, kubevirt presubmits: Add new jobs for kind-1.22-sriov

Following kubevirt/kubevirtci#694, create presubmits jobs for
the new provider.

Once we see 'periodic-kubevirt-e2e-k8s-1.22-sriov' job is stable
we can set it as mandatory and remove the old one.

Signed-off-by: Or Mergi <[email protected]>
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/L
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants