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

azure: Populate node labels from tags #15667

Merged
merged 1 commit into from
Jul 19, 2023
Merged

azure: Populate node labels from tags #15667

merged 1 commit into from
Jul 19, 2023

Conversation

hakman
Copy link
Member

@hakman hakman commented Jul 19, 2023

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jul 19, 2023
justinsb
justinsb reviewed Jul 19, 2023
View reviewed changes
pkg/nodeidentity/azure/identify.go Outdated
if strings.HasPrefix(k, azure.TagNameRolePrefix) {
role := strings.TrimPrefix(k, azure.TagNameRolePrefix)
switch {
case strings.HasSuffix(nodelabels.RoleLabelControlPlane20, role):
Copy link
Member

Choose a reason for hiding this comment

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

Should this just be checking against the instancegroup roles (and I think you've already stripped the prefix)?

https://github.com/kubernetes/kops/blob/d5c24585187ddb50647fa939cb4e7fa8d997b077/pkg/model/azuremodel/context.go#L117C1-L121

Copy link
Member Author

Choose a reason for hiding this comment

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

Azure tag is in the format "k8s.io_role_control-plane": "1", so we have to trim the k8s.io_role_ prefix.
I agree that it looks better now with the InstanceGroupRoleX.ToLowerString().

@justinsb
Copy link
Member

Thanks @hakman - and thanks for tweaking the code I didn't grok!

/approve
/lgtm

@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 Jul 19, 2023
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 19, 2023
@hakman hakman requested a review from justinsb July 19, 2023 15:12
@justinsb
Copy link
Member

/approve
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 19, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: justinsb

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 merged commit d9efa71 into kubernetes:master Jul 19, 2023
@k8s-ci-robot k8s-ci-robot added this to the v1.28 milestone Jul 19, 2023
@hakman hakman deleted the azure_validate_tags branch July 19, 2023 15:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rifelpet rifelpet Awaiting requested review from rifelpet

@justinsb justinsb Awaiting requested review from justinsb

Assignees

@justinsb justinsb

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. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v1.28
Development

Successfully merging this pull request may close these issues.
3 participants
@hakman @justinsb @k8s-ci-robot