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: get vmss name and resource group from vm ID if the provider ID o… #2984

Merged
merged 1 commit into from Dec 22, 2022
Merged

fix: get vmss name and resource group from vm ID if the provider ID o… #2984

merged 1 commit into from Dec 22, 2022

Conversation

nilo19
Copy link
Contributor

@nilo19 nilo19 commented Dec 21, 2022

…f the node is empty

What type of PR is this?

/kind bug

What this PR does / why we need it:

When a new node is just joining the cluster, the providerID can be empty. In this case, we will skip the VMSS in ensureVMSSInPool. This PR fixes this by using the VM ID instead.

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?

fix: get vmss name and resource group from vm ID if the provider ID of the node is empty

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

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. labels Dec 21, 2022
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: nilo19

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

@netlify
Copy link

netlify bot commented Dec 21, 2022 •
edited

✅ Deploy Preview for kubernetes-sigs-cloud-provide-azure canceled.

Name Link
🔨 Latest commit 40d467c
🔍 Latest deploy log https://app.netlify.com/sites/kubernetes-sigs-cloud-provide-azure/deploys/63a2f1c1a6c244000833a040

@k8s-ci-robot k8s-ci-robot added 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. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Dec 21, 2022
@coveralls
Copy link

coveralls commented Dec 21, 2022 •
edited

Coverage Status

Coverage increased (+0.02%) to 79.387% when pulling 40d467c on nilo19:fix/empty-provider-id into 8eb4cb1 on kubernetes-sigs:master.

feiskyer
feiskyer reviewed Dec 22, 2022
View reviewed changes
pkg/provider/azure_vmss.go
vmssPIPConfigurationRE = regexp.MustCompile(`.*/subscriptions/(?:.*)/resourceGroups/(.+)/providers/Microsoft.Compute/virtualMachineScaleSets/(.+)/virtualMachines/(.+)/networkInterfaces/(.+)/ipConfigurations/(.+)/publicIPAddresses/(.+)`)
vmssVMResourceIDTemplate = `/subscriptions/(?:.*)/resourceGroups/(.+)/providers/Microsoft.Compute/virtualMachineScaleSets/(.+)/virtualMachines/(?:\d+)`
vmssVMResourceIDRE = regexp.MustCompile(vmssVMResourceIDTemplate)
vmssVMProviderIDRE = regexp.MustCompile(fmt.Sprintf("%s%s", "azure://", vmssVMResourceIDTemplate))
Copy link
Member

Choose a reason for hiding this comment

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

vmssVMResourceIDRE and vmssVMProviderIDRE could be merged together with .* prefix

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, but I want to make sure the provider ID will start with the azure://.

@feiskyer
Copy link
Member

feiskyer commented Dec 22, 2022 •
edited

The test failures didn't seem related to this change

/retest

@MartinForReal
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 22, 2022
@k8s-ci-robot k8s-ci-robot merged commit eaa9da7 into kubernetes-sigs:master Dec 22, 2022
@nilo19 nilo19 deleted the fix/empty-provider-id branch December 22, 2022 11:42
@nilo19
Copy link
Contributor Author

nilo19 commented Dec 22, 2022

/cherrypick release-1.26

@k8s-infra-cherrypick-robot
Copy link

@nilo19: #2984 failed to apply on top of branch "release-1.26":

Applying: fix: get vmss name and resource group from vm ID if the provider ID of the node is empty
Using index info to reconstruct a base tree...
M	pkg/provider/azure_vmss.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/provider/azure_vmss.go
CONFLICT (content): Merge conflict in pkg/provider/azure_vmss.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 fix: get vmss name and resource group from vm ID if the provider ID of the node is empty
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-1.26

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@feiskyer feiskyer feiskyer left review comments

@lzhecheng lzhecheng Awaiting requested review from lzhecheng

@MartinForReal MartinForReal Awaiting requested review from MartinForReal

Assignees

@MartinForReal MartinForReal

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. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@nilo19 @k8s-ci-robot @coveralls @feiskyer @MartinForReal @k8s-infra-cherrypick-robot