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.

Sign up for GitHub

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

Jump to bottom

Fix node label conversion in Azure #10935

Merged
merged 1 commit into from
Mar 1, 2021
Merged

Fix node label conversion in Azure #10935

merged 1 commit into from
Mar 1, 2021

Conversation

kenji-cloudnatix
Copy link
Contributor

As Azure doesn't allow "/" in label keys, we used to convert "/" to
"", but we didn't convert back "" to "/" in kops-controller. This
commit fixes this.

Change the conversion semantics so that "/" is converted to "s". ""
is converted to "__" so that we can distinguish the original "_" and
"_s".

@k8s-ci-robot k8s-ci-robot added 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 Feb 26, 2021
@k8s-ci-robot
Copy link
Contributor

Hi @kenji-cloudnatix. Thanks for your PR.

I'm waiting for a kubernetes 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 area/provider/azure Issues or PRs related to azure provider size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Feb 26, 2021
@kenji-cloudnatix kenji-cloudnatix mentioned this pull request Feb 26, 2021
Merged
@kenji-cloudnatix kenji-cloudnatix force-pushed the kenji/fix_node_name_conversion branch from cc5db2d to d4cb5af Compare February 26, 2021 07:55
@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 Feb 26, 2021
@bharath-123
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 Feb 26, 2021
@kenji-cloudnatix kenji-cloudnatix force-pushed the kenji/fix_node_name_conversion branch 2 times, most recently from ca883ad to f395808 Compare February 27, 2021 03:32
@hakman
Copy link
Member

hakman commented Feb 27, 2021

/retest

@kenji-cloudnatix kenji-cloudnatix force-pushed the kenji/fix_node_name_conversion branch 2 times, most recently from 23168fc to 4ed78c1 Compare March 1, 2021 04:19
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hakman

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 lgtm "Looks good to me", 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 Mar 1, 2021
@hakman hakman mentioned this pull request Mar 1, 2021
Closed
@hakman
Copy link
Member

hakman commented Mar 1, 2021

Ah... one more thing, would you mind squashing the commits?

@hakman
Copy link
Member

hakman commented Mar 1, 2021

/hold

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 1, 2021
@kenji-cloudnatix
Fix node label conversion in Azure
a2bfbdd 
As Azure doesn't allow "/" in label keys, we used to convert "/" to
"_", but we didn't convert back "_" to "/" in kops-controller.

Change the code to store a label key in a tag value so that we don't
need to worry about escaping.
@kenji-cloudnatix kenji-cloudnatix force-pushed the kenji/fix_node_name_conversion branch from caf8231 to a2bfbdd Compare March 1, 2021 06:35
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 1, 2021
@kenji-cloudnatix
Copy link
Contributor Author

Sure! Done!

@hakman
Copy link
Member

hakman commented Mar 1, 2021

Thanks! :)
/hold cancel
/lgtm

@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Mar 1, 2021
@hakman hakman mentioned this pull request Mar 1, 2021
Merged
@hakman
Copy link
Member

hakman commented Mar 1, 2021

/retest

@k8s-ci-robot k8s-ci-robot merged commit c802127 into kubernetes:master Mar 1, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.21 milestone Mar 1, 2021
k8s-ci-robot added a commit that referenced this pull request Mar 2, 2021
@k8s-ci-robot
Merge pull request #10952 from hakman/automated-cherry-pick-of-#10935…
4ea21d4 
…-upstream-release-1.20

Automated cherry pick of #10935: Fix node label conversion in Azure
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rifelpet rifelpet rifelpet left review comments

@hakman hakman hakman approved these changes

@KashifSaadat KashifSaadat Awaiting requested review from KashifSaadat

@zetaab zetaab Awaiting requested review from zetaab

Assignees

@hakman hakman

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/provider/azure Issues or PRs related to azure provider cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. 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
Milestone
v1.21
Development

Successfully merging this pull request may close these issues.
5 participants
@kenji-cloudnatix @k8s-ci-robot @bharath-123 @hakman @rifelpet