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

[2.17] Fix kubespray flatcar ansible_os_family and ansible_distribution #8181

Conversation

isantospardo
Copy link
Contributor

Cherry-picks commit due to request: #8028 (comment)
Related to #8028
Closes #8180

What type of PR is this?
/kind bug

What this PR does / why we need it:
Compatibility with all flatcar verions as ansible_os_family and ansible_distribution are set to Flatcar instead of to Flatcar Container Linux by Kinvolk for several versions

Which issue(s) this PR fixes:

Cherry-picks commit due to request: #8028 (comment)
Related to #8028
Closes #8180

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

NONE

Fix kubespray flatcar ansible_os_family and ansible_distribution for backward compatibility

@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 Nov 10, 2021
@k8s-ci-robot
Copy link
Contributor

Hi @isantospardo. 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/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Nov 10, 2021
@cristicalin
Copy link
Contributor

Hi @isantospardo , thanks for this fix but you will need to cherry-pick #8034 into your change since our CI was pushed to python 3.10 and that needed extra fixes.

Since we already tagged 2.17.1, I think we will need to bundle a few more backports to tag 2.17.2 to include that fix.

/cc @floryut

@k8s-ci-robot k8s-ci-robot requested a review from floryut November 10, 2021 18:33
@oomichi
Copy link
Contributor

oomichi commented Nov 11, 2021

To understand this is a backporting pull request easily

/retitle [2.17] Fix kubespray flatcar ansible_os_family and ansible_distribution

@k8s-ci-robot k8s-ci-robot changed the title Fix kubespray flatcar ansible_os_family and ansible_distribution [2.17] Fix kubespray flatcar ansible_os_family and ansible_distribution Nov 11, 2021
@isantospardo
Copy link
Contributor Author

/retest

@k8s-ci-robot
Copy link
Contributor

@isantospardo: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/retest

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.

@isantospardo
Copy link
Contributor Author

Do you want me to cherry-pick the rest of the commits of v2.17.1? @cristicalin

@cristicalin
Copy link
Contributor

cristicalin commented Nov 17, 2021

@isantospardo there is no need, the merge process will handle the actual merge but you do need to rebase on the current state of the release-2.17 branch because it also brings in #8153 which was backported earlier.

@isantospardo isantospardo force-pushed the fix/cherrypick-flatcar-ansible-osss branch from 27bece0 to afc43bf Compare November 18, 2021 10:36
@isantospardo
Copy link
Contributor Author

It looks we still have some issues after the rebase @cristicalin

@oomichi
Copy link
Contributor

oomichi commented Nov 18, 2021

/ok-to-test
/lgtm

@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 Nov 18, 2021
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 18, 2021
@oomichi
Copy link
Contributor

oomichi commented Nov 18, 2021

We might need to cherry-pick 2ed211b

@oomichi
Copy link
Contributor

oomichi commented Nov 18, 2021

The cherry-pick is #8210
Let's see the result.

@floryut
Copy link
Member

floryut commented Nov 19, 2021

The cherry-pick is #8210 Let's see the result.

All done, please rebase branch release-2.17

Closes kubernetes-sigs#8028

Signed-off-by: Iago Santos <iago.santos.pardo@adfinis.com>
@isantospardo isantospardo force-pushed the fix/cherrypick-flatcar-ansible-osss branch from afc43bf to bd23901 Compare November 19, 2021 08:03
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 19, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

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

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 Nov 19, 2021
@isantospardo
Copy link
Contributor Author

@oomichi could you add the lgtm again to run the last job?

@oomichi
Copy link
Contributor

oomichi commented Nov 19, 2021

Thanks for doing this.

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 19, 2021
@k8s-ci-robot k8s-ci-robot merged commit f4dae74 into kubernetes-sigs:release-2.17 Nov 19, 2021
@isantospardo
Copy link
Contributor Author

One more thing, could you please create a new tag v.2.17.2 with this patch? @oomichi

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/bug Categorizes issue or PR as related to a bug. 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.

5 participants