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

Rename ansible groups to use _ instead of - #7552

Merged
merged 2 commits into from
Apr 29, 2021

Conversation

cristicalin
Copy link
Contributor

@cristicalin cristicalin commented Apr 26, 2021

rename ansible groups to use _ instead of -

k8s-cluster -> k8s_cluster
kube-node -> kube_node
calico-rr -> calico_rr
no-floating -> no_floating

What type of PR is this?

Uncomment only one /kind <> line, hit enter to put that in a new line, and remove leading whitespaces from that line:

/kind api-change
/kind bug
/kind cleanup
/kind design
/kind documentation
/kind failing-test
/kind feature
/kind flake

What this PR does / why we need it:
This PR renames some ansible groups to be consistent with dynamic ansible inventory plugins like AWX.

Which issue(s) this PR fixes:

Fixes #7536

Special notes for your reviewer:
This PR touches a lot of files, I apologize for the giant size.

Does this PR introduce a user-facing change?:

Ansible groups were updated to be more consistent with dynamic inventory plugins:
k8s-cluster -> k8s_cluster
kube-node -> kube_node
calico-rr -> calico_rr
no-floating -> no_floating

@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 Apr 26, 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 requested review from alijahnas and bozzo April 26, 2021 07:51
@k8s-ci-robot k8s-ci-robot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Apr 26, 2021
@floryut floryut marked this pull request as draft April 26, 2021 08:24
@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 26, 2021
@floryut floryut changed the title do-not-merge-yet: rename ansible groups to use _ instead of - Rename ansible groups to use _ instead of - Apr 26, 2021
@floryut
Copy link
Member

floryut commented Apr 26, 2021

@cristicalin I've remove the "do not merge yet" and put the PR as draft, it's cleaner ;)

@cristicalin
Copy link
Contributor Author

I added the missing compatibility layer so this should be ready for CI and review.

@cristicalin cristicalin marked this pull request as ready for review April 26, 2021 09:20
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 26, 2021
@cristicalin
Copy link
Contributor Author

I'm not sure the failure currently in CI is related to the change, as far as I can see the cluster is up and was able to run workloads.

@cristicalin cristicalin marked this pull request as draft April 27, 2021 14:46
@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 27, 2021
@oomichi
Copy link
Contributor

oomichi commented Apr 27, 2021

/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. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Apr 27, 2021
@cristicalin
Copy link
Contributor Author

I believe the CI needs some love again since the failing test appears to be an ssh timeout unrelated to the changes in this PR.

@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 28, 2021
@cristicalin cristicalin marked this pull request as ready for review April 28, 2021 07:58
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 28, 2021
contrib/dind/run-test-distros.sh Outdated Show resolved Hide resolved
k8s-cluster -> k8s_cluster
k8s-node -> k8s_node
calico-rr -> calico_rr
no-floating -> no_floating

Note: kube-node,k8s-cluster groups in upgrade CI
      need clean-up after v2.16 is tagged
@cristicalin
Copy link
Contributor Author

The CI is upset again for some networking (as far as I can tell) reason.

@champtar
Copy link
Contributor

/lgtm
I say let's go ahead fast so anything that was missed can be addressed before next release, and we ask the users to change their inventory only once

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

floryut commented Apr 29, 2021

@cristicalin Thank you for that 👍

@k8s-ci-robot k8s-ci-robot merged commit 360aff4 into kubernetes-sigs:master Apr 29, 2021
@floryut floryut mentioned this pull request May 11, 2021
LuckySB pushed a commit to southbridgeio/kubespray that referenced this pull request Jun 12, 2021
* rename ansible groups to use _ instead of -

k8s-cluster -> k8s_cluster
k8s-node -> k8s_node
calico-rr -> calico_rr
no-floating -> no_floating

Note: kube-node,k8s-cluster groups in upgrade CI
      need clean-up after v2.16 is tagged

* ensure old groups are mapped to the new ones
@rptaylor
Copy link
Contributor

rptaylor commented Oct 5, 2021

Looks like this has also changed kube-node to kube_node, though it is not mentioned in the 2.16 release notes or the description of this PR.

Actually the description says k8s-node -> k8s_node but those group names do not exist.

@floryut
Copy link
Member

floryut commented Oct 5, 2021

Looks like this has also changed kube-node to kube_node, though it is not mentioned in the 2.16 release notes or the description of this PR.

Actually the description says k8s-node -> k8s_node but those group names do not exist.

Oops .. you're totally right, I've edit the PR desc in case anyone drop on this PR.

sakuraiyuta pushed a commit to sakuraiyuta/kubespray that referenced this pull request Apr 16, 2022
* rename ansible groups to use _ instead of -

k8s-cluster -> k8s_cluster
k8s-node -> k8s_node
calico-rr -> calico_rr
no-floating -> no_floating

Note: kube-node,k8s-cluster groups in upgrade CI
      need clean-up after v2.16 is tagged

* ensure old groups are mapped to the new ones
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/feature Categorizes issue or PR as related to a new feature. 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/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Rename kube-node group to kube_node
6 participants