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

Arm64 should be upper cased and a const #4018

Merged

Conversation

CecileRobertMichon
Copy link
Contributor

@CecileRobertMichon CecileRobertMichon commented Sep 20, 2023

What type of PR is this?

/kind bug

What this PR does / why we need it: Azure VM SKU cpuArchitectureType property is Arm64, not arm64. Note: I tried to find a const in the Azure SDK to use directly but couldn't find one. @mboersma to the rescue!

Special thanks to @arsiesys for finding the issue

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #4016

Special notes for your reviewer:

  • cherry-pick candidate

TODOs:

  • squashed commits
  • includes documentation
  • adds unit tests

Release note:

fix arm64 extension selection

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Sep 20, 2023
@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Sep 20, 2023
@CecileRobertMichon
Copy link
Contributor Author

/cherry-pick release-1.11
/cherry-pick release-1.10

@k8s-infra-cherrypick-robot

@CecileRobertMichon: once the present PR merges, I will cherry-pick it on top of release-1.11 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.11
/cherry-pick release-1.10

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.

@CecileRobertMichon
Copy link
Contributor Author

/assign @mboersma

@mboersma
Copy link
Contributor

I tried to find a const in the Azure SDK to use directly

There is armcompute.ArchitectureTypesArm64: https://pkg.go.dev/github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5#ArchitectureTypes

@codecov
Copy link

codecov bot commented Sep 20, 2023

Codecov Report

Patch coverage: 100.00% and no project coverage change.

Comparison is base (2e333aa) 56.58% compared to head (b653f89) 56.58%.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #4018   +/-   ##
=======================================
  Coverage   56.58%   56.58%           
=======================================
  Files         187      187           
  Lines       19126    19126           
=======================================
  Hits        10823    10823           
  Misses       7672     7672           
  Partials      631      631           
Files Changed Coverage Δ
azure/defaults.go 48.79% <100.00%> (ø)

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@k8s-ci-robot k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Sep 20, 2023
@CecileRobertMichon
Copy link
Contributor Author

Thank you @mboersma that's much better

Copy link
Contributor

@mboersma mboersma left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

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

LGTM label has been added.

Git tree hash: bd669ffb87c89eec1b1e9b047d42989b989811d7

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mboersma

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 Sep 20, 2023
@k8s-ci-robot k8s-ci-robot merged commit 3dea65e into kubernetes-sigs:main Sep 20, 2023
@k8s-infra-cherrypick-robot

@CecileRobertMichon: #4018 failed to apply on top of branch "release-1.10":

Applying: Arm64 should be upper cased and a const
Using index info to reconstruct a base tree...
M	azure/defaults.go
M	azure/defaults_test.go
Falling back to patching base and 3-way merge...
Auto-merging azure/defaults_test.go
CONFLICT (content): Merge conflict in azure/defaults_test.go
Auto-merging azure/defaults.go
CONFLICT (content): Merge conflict in azure/defaults.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 Arm64 should be upper cased and a const
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:

/cherry-pick release-1.11
/cherry-pick release-1.10

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-infra-cherrypick-robot

@CecileRobertMichon: new pull request created: #4020

In response to this:

/cherry-pick release-1.11
/cherry-pick release-1.10

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.

@mboersma
Copy link
Contributor

mboersma commented Sep 20, 2023

#4018 failed to apply on top of branch "release-1.10":

There is a compute.ArchitectureTypesArm64 constant we could use for the release-1.10 branch (Azure SDK for Go v1): https://pkg.go.dev/github.com/Azure/[email protected]+incompatible/services/compute/mgmt/2021-11-01/compute#ArchitectureTypes

@nojnhuh nojnhuh added this to the v1.12 milestone Sep 21, 2023
@nojnhuh
Copy link
Contributor

nojnhuh commented Sep 22, 2023

@CecileRobertMichon Are we still looking to backport this to release-1.10?

@CecileRobertMichon
Copy link
Contributor Author

CecileRobertMichon commented Sep 22, 2023

@nojnhuh yes thanks for the nudge, I'll open a manual cherry-pick PR shortly

I take that back, the PR that added the constant was only merged in 1.11 so no need to cherry-pick to 1.10 1fcf681

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. 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/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

ARM64 MachinePool creation fail with "ExtensionNotFoundForCPUArchitecture"
5 participants