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

Update check calico version command #9861

Conversation

zhan9san
Copy link
Contributor

@zhan9san zhan9san commented Mar 7, 2023

What type of PR is this?

/kind bug

What this PR does / why we need it:

The Get current calico cluster version has not ever been working.

And the task fail is ignore, by 'fail_when: false'

TASK [network_plugin/calico : Get current calico cluster version] ********************************************************************************
ok: [node1]

It's Client instead of Cluster

$ /usr/local/bin/calicoctl.sh version
Client Version:    v3.24.5
Git commit:        f1a1611ac
Unable to detect installed Calico version

Which issue(s) this PR fixes:

No issue

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

[Calico] Improve version check command

@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Mar 7, 2023
@k8s-ci-robot
Copy link
Contributor

Hi @zhan9san. 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 needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Mar 7, 2023
@cyclinder
Copy link
Contributor

/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 Mar 7, 2023
@@ -44,19 +44,11 @@
delegate_to: "{{ groups['kube_control_plane'][0] }}"

- name: Get current calico cluster version
Copy link
Contributor

Choose a reason for hiding this comment

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

change name to: Get current calico version

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for your review.
I'll update it in new commit

@@ -67,8 +59,6 @@
Minimum version is {{ calico_min_version_required }} supported by the previous kubespray release.
But current version is {{ calico_version_on_server.stdout }}.
when:
- 'calico_version_on_server.stdout is defined'
Copy link
Contributor

Choose a reason for hiding this comment

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

I think it should be keep here

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Previously, calico_version_on_server.stdout is always undefined as the check command is wrong.

If the check version is required, the stdout is expected to be an exact version. Otherwise, the assertion would fail.

If we allow/ignore the stdout is undefined, it seems there is no need to check the version anymore.

until: calico_version_on_server.stdout != 'unknown'
retries: 5
delay: "{{ retry_stagger | random + 3 }}"
delegate_to: "{{ groups['kube_control_plane'][0] }}"
Copy link
Contributor

Choose a reason for hiding this comment

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

Lines 51-57 should be kept also, Why are they being removed?

Copy link
Contributor Author

@zhan9san zhan9san Mar 7, 2023

Choose a reason for hiding this comment

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

Thanks for your review.

The run_once: True and delegate_to: "{{ groups['kube_control_plane'][0] }}" is removed by mistake. I'll add them back in new commit.

But for the rest of lines removed, I don't think it should be kept.

In general, the async is for some long tasks, and there is async_status after that to wait to complete.

But we don't use async in that manner. IMO, the check version is a light-weight option, so there is no need to introduce async.

Looking forward to your reply.

Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks for your explanation. The changes in this version look very clean!

/lgtm

@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Mar 7, 2023
@zhan9san zhan9san force-pushed the feature/update-calicoctl-check-version-task branch from d6699ce to 218dfbf Compare March 7, 2023 10:11
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 8, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mzaian, zhan9san

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 Mar 8, 2023
@k8s-ci-robot k8s-ci-robot merged commit 1ca50f3 into kubernetes-sigs:master Mar 8, 2023
@floryut floryut added kind/network Network section in the release note and removed kind/bug Categorizes issue or PR as related to a bug. labels Mar 9, 2023
nolimitkun pushed a commit to nolimitkun/kubespray that referenced this pull request Mar 19, 2023
@yankay yankay mentioned this pull request May 15, 2023
pedro-peter pushed a commit to pedro-peter/kubespray that referenced this pull request May 8, 2024
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/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants