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

Calico: make calico_min_version check relevant #7939

Merged

Conversation

cristicalin
Copy link
Contributor

@cristicalin cristicalin commented Sep 4, 2021

What type of PR is this?

/kind feature

What this PR does / why we need it:
In the kubernetes role we have a validation task which checks for the minimum calico version. This brings our check in line with the lowest supported version.

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

[Calico] Make `calico_min_version` check relevant

@k8s-ci-robot k8s-ci-robot added kind/feature Categorizes issue or PR as related to a new feature. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Sep 4, 2021
@k8s-ci-robot
Copy link
Contributor

Hi @cristicalin. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Sep 4, 2021
@k8s-ci-robot k8s-ci-robot requested review from EppO and oomichi September 4, 2021 21:36
Copy link
Member

@floryut floryut left a comment

Choose a reason for hiding this comment

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

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Sep 6, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cristicalin, floryut

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 6, 2021
@champtar
Copy link
Contributor

champtar commented Sep 6, 2021

The min version should be the minimum version we can update from no ?

@cristicalin
Copy link
Contributor Author

@champtar actually, the way we check this is not tied to the previous version at all but only on what we have in the inventory: https://github.com/kubernetes-sigs/kubespray/blob/master/roles/kubernetes/preinstall/tasks/0020-verify-settings.yml#L192-L199

This actually checks that the deployer updated their inventory with the minimum supported calico version which, given our policy of not maintaining more than one minor version for each major calico version may mean that it is higher than what was deployed by the previous version of calico (i.e. kubespray 2.15 supported calico 3.17.3 while kubespray 2.16 supports calico 3.17.5). In the end this check is useless and defeated by the check here: https://github.com/kubernetes-sigs/kubespray/blob/master/roles/kubernetes/preinstall/tasks/0020-verify-settings.yml#L50-L57 which validates that the inventory contains an actually supported calico_version and not just a minimum.

Looking at this implementation again, I would actually drop the logic that checks for calico_min_version since it effectively does nothing. We can actually move the check for calico_min_version to this https://github.com/kubernetes-sigs/kubespray/blob/master/roles/kubernetes/preinstall/tasks/0020-verify-settings.yml#L213-L223 which is a more meaningful check that the version actually deployed is compatible to upgrade from.

@cristicalin cristicalin force-pushed the update_calico_min_version branch from 1c8df2b to 5116b59 Compare September 18, 2021 12:40
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Sep 18, 2021
@cristicalin
Copy link
Contributor Author

With version 2.17 released, I would like to revive this PR.

/cc @champtar @floryut

@oomichi
Copy link
Contributor

oomichi commented Sep 20, 2021

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 20, 2021
@k8s-ci-robot k8s-ci-robot merged commit 6f79112 into kubernetes-sigs:master Sep 20, 2021
@floryut floryut added kind/network Network section in the release note and removed kind/feature Categorizes issue or PR as related to a new feature. labels Sep 20, 2021
rtsp pushed a commit to rtsp/kubespray that referenced this pull request Sep 23, 2021
* Calico: make calico_min_version check relevant

* Calico: only check currently installed version against the oldest supported version by the previous release
LuckySB pushed a commit to southbridgeio/kubespray that referenced this pull request Oct 23, 2021
* Calico: make calico_min_version check relevant

* Calico: only check currently installed version against the oldest supported version by the previous release
@floryut floryut mentioned this pull request Dec 21, 2021
sakuraiyuta pushed a commit to sakuraiyuta/kubespray that referenced this pull request Apr 16, 2022
* Calico: make calico_min_version check relevant

* Calico: only check currently installed version against the oldest supported version by the previous release
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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/network Network section in the release note lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants