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

Jump to bottom

validate nodeLabels in kubelet #109263

Merged
merged 1 commit into from Jul 30, 2022
Merged

validate nodeLabels in kubelet #109263

merged 1 commit into from Jul 30, 2022
+24 −1

Conversation

FeLvi-zzz
Copy link
Member

@FeLvi-zzz FeLvi-zzz commented Apr 3, 2022 •
edited by k8s-ci-robot

What type of PR is this?

/kind bug

What this PR does / why we need it:

add validation in kubelet --node-labels flag.

Which issue(s) this PR fixes:

Fixes #109262

Special notes for your reviewer:

Does this PR introduce a user-facing change?

kubelet: add validation for labels provided with --node-labels. Malformed labels will result in errors.

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Apr 3, 2022
@linux-foundation-easycla
Copy link

linux-foundation-easycla bot commented Apr 3, 2022 •
edited

CLA Signed

The committers listed above are authorized under a signed CLA.

  • ✅ login: FeLvi-zzz / name: Soh Takada (692958c4111d3c9cdeb2b9e1d5d8a586c9cb4fc6)

@k8s-ci-robot k8s-ci-robot added cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Apr 3, 2022
@k8s-ci-robot
Copy link
Contributor

Welcome @FeLvi-zzz!

It looks like this is your first PR to kubernetes/kubernetes 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes/kubernetes has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot
Copy link
Contributor

Hi @FeLvi-zzz. 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 needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. area/kubelet sig/node Categorizes an issue or PR as relevant to SIG Node. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Apr 3, 2022
@FeLvi-zzz FeLvi-zzz marked this pull request as draft April 3, 2022 10:05
@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. release-note-none Denotes a PR that doesn't merit a release note. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Apr 3, 2022
@FeLvi-zzz FeLvi-zzz marked this pull request as ready for review April 3, 2022 10:19
@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 3, 2022
VirrageS
VirrageS suggested changes Apr 3, 2022
View reviewed changes
cmd/kubelet/app/options/options.go Outdated Show resolved Hide resolved
cmd/kubelet/app/options/options_test.go Outdated Show resolved Hide resolved
cmd/kubelet/app/options/options.go Outdated Show resolved Hide resolved
yangjunmyfm192085
yangjunmyfm192085 reviewed Apr 3, 2022
View reviewed changes
Copy link
Contributor

@yangjunmyfm192085 yangjunmyfm192085 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 Apr 3, 2022
@endocrimes
Copy link
Member

/triage accepted
/priority backlog

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. priority/backlog Higher priority than priority/awaiting-more-evidence. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Apr 5, 2022
@endocrimes endocrimes moved this from Triage to Waiting on Author in SIG Node PR Triage Apr 5, 2022
@FeLvi-zzz
validate nodeLabels in kubelet
5ec2aaa 
Signed-off-by: Soh Takada <34182539+FeLvi-zzz@users.noreply.github.com>
@FeLvi-zzz FeLvi-zzz force-pushed the add-kubelet-nodeLabels-validation branch from 411fb78 to 5ec2aaa Compare April 7, 2022 11:27
FeLvi-zzz
FeLvi-zzz commented Apr 7, 2022
View reviewed changes
cmd/kubelet/app/options/options_test.go
labels: map[string]string{
"cloud.google.com/repository": "kubernetes/kubernetes",
},
},
Copy link
Member Author

Choose a reason for hiding this comment

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

This case returns error,

invalid node labels: 'kubernetes/kubernetes' - a valid label must be an empty string or consist of alphanumeric characters, '-', '_' or '.', and must start and end with an alphanumeric character (e.g. 'MyValue',  or 'my_value',  or '12345', regex used for validation is '(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])?')

Copy link
Member

Choose a reason for hiding this comment

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

Thanks for an error message as an example here.

@FeLvi-zzz FeLvi-zzz requested a review from neolit123 April 7, 2022 11:29
neolit123
neolit123 reviewed Apr 7, 2022
View reviewed changes
Copy link
Member

@neolit123 neolit123 left a comment

Choose a reason for hiding this comment

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

Thanks for the PR. It looks good to me but it needs review from the kubelet maintainers. We are also in code freeze for 1.24.

@yxxhero
Copy link
Member

yxxhero commented Apr 10, 2022

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 10, 2022
@FeLvi-zzz
Copy link
Member Author

/assign @klueska

@FeLvi-zzz
Copy link
Member Author

@klueska
Could you review this PR at your convenience?

@FeLvi-zzz FeLvi-zzz requested a review from neolit123 June 14, 2022 01:13
@pacoxu pacoxu moved this from Waiting on Author to Needs Approver in SIG Node PR Triage Jun 20, 2022
@FeLvi-zzz
Copy link
Member Author

/assign @mrunalp

@dchen1107 dchen1107 moved this from Needs Approver to Done in SIG Node PR Triage Jul 30, 2022
@dchen1107 dchen1107 added this to the v1.25 milestone Jul 30, 2022
@dchen1107
Copy link
Member

/lgtm
/approve

Thanks for improving the usability of the system. :-)

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dchen1107, FeLvi-zzz

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 Jul 30, 2022
@k8s-ci-robot k8s-ci-robot merged commit 451c00c into kubernetes:master Jul 30, 2022
@FeLvi-zzz FeLvi-zzz deleted the add-kubelet-nodeLabels-validation branch February 3, 2023 15:45
@FeLvi-zzz FeLvi-zzz mentioned this pull request Feb 6, 2023
Closed
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dchen1107 dchen1107 dchen1107 left review comments

@yangjunmyfm192085 yangjunmyfm192085 yangjunmyfm192085 left review comments

@VirrageS VirrageS VirrageS requested changes

@krmayankk krmayankk Awaiting requested review from krmayankk

@odinuge odinuge Awaiting requested review from odinuge

@ehashman ehashman Awaiting requested review from ehashman

@Random-Liu Random-Liu Awaiting requested review from Random-Liu

@neolit123 neolit123 Awaiting requested review from neolit123

Assignees

@mrunalp mrunalp

@klueska klueska

@dchen1107 dchen1107

@yxxhero yxxhero

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/kubelet 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. priority/backlog Higher priority than priority/awaiting-more-evidence. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/node Categorizes an issue or PR as relevant to SIG Node. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
SIG Node PR Triage
Done
Milestone
v1.25
Development

Successfully merging this pull request may close these issues.

kubelet --node-labels flag doesn't validate labels
10 participants
@FeLvi-zzz @k8s-ci-robot @neolit123 @endocrimes @yxxhero @dchen1107 @VirrageS @yangjunmyfm192085 @mrunalp @klueska