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

Use new naming scheme for SKUs and versions #2302

Merged
merged 1 commit into from
Jun 3, 2022

Conversation

mboersma
Copy link
Contributor

What type of PR is this?:

/kind feature

What this PR does / why we need it:

This catches up with the SKU and version naming changes in kubernetes-sigs/image-builder#878

Which issue(s) this PR fixes:

N/A

Special notes for your reviewer:

TODOs:

  • squashed commits
  • includes documentation
  • adds unit tests

Release note:

Use new naming scheme for SKUs and versions

@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/feature Categorizes issue or PR as related to a new feature. 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 May 13, 2022
@mboersma mboersma changed the title Use new naming scheme for SKUs and versions [WIP] Use new naming scheme for SKUs and versions May 13, 2022
@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 13, 2022
@mboersma mboersma force-pushed the update-sku-naming branch from 6b71e49 to f169c61 Compare May 18, 2022 20:35
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels May 18, 2022
@netlify
Copy link

netlify bot commented May 20, 2022

👷 Deploy request for kubernetes-sigs-cluster-api-provider-azure pending review.

Visit the deploys page to approve it

Name Link
🔨 Latest commit 50463a5

@mboersma mboersma force-pushed the update-sku-naming branch from 50463a5 to 4f8c87a Compare May 23, 2022 20:21
@mboersma mboersma changed the title [WIP] Use new naming scheme for SKUs and versions Use new naming scheme for SKUs and versions May 23, 2022
@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 May 23, 2022
@mboersma mboersma changed the title Use new naming scheme for SKUs and versions [WIP] Use new naming scheme for SKUs and versions May 24, 2022
@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. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels May 24, 2022
@mboersma mboersma changed the title [WIP] Use new naming scheme for SKUs and versions Use new naming scheme for SKUs and versions May 26, 2022
@mboersma
Copy link
Contributor Author

/retest

@mboersma
Copy link
Contributor Author

/retest-required

@mboersma
Copy link
Contributor Author

mboersma commented Jun 2, 2022

@jsturtevant or @Jont828, could you take a look at this when time permits?

@Jont828
Copy link
Contributor

Jont828 commented Jun 2, 2022

Yeah sure thing, happy to take a look.

azure/services/virtualmachineimages/cache_test.go Outdated Show resolved Hide resolved
azure/services/virtualmachineimages/cache_test.go Outdated Show resolved Hide resolved
azure/scope/machine_test.go Outdated Show resolved Hide resolved
azure/services/virtualmachineimages/images.go Outdated Show resolved Hide resolved
azure/services/virtualmachineimages/images_test.go Outdated Show resolved Hide resolved
@mboersma mboersma force-pushed the update-sku-naming branch from 48d6fd9 to 0481cff Compare June 3, 2022 15:18
@mboersma
Copy link
Contributor Author

mboersma commented Jun 3, 2022

Thanks @Jont828, I made all your suggested changes and they definitely improved the unit tests. 👍🏻

@k8s-ci-robot
Copy link
Contributor

@mboersma: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-cluster-api-provider-azure-apidiff 0481cff link false /test pull-cluster-api-provider-azure-apidiff

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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. I understand the commands that are listed here.

Copy link
Contributor

@CecileRobertMichon CecileRobertMichon left a comment

Choose a reason for hiding this comment

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

@mboersma I just realized the SKU name change is also going to break our e2e logic that selects the latest SKU available for a given k8s major.minor https://github.com/kubernetes-sigs/cluster-api-provider-azure/blob/main/test/e2e/helpers.go#L777

We can merge this one now to unblock users and address e2e separately, the tests will just be stuck at the latest version that was published with the old naming until we fix them.

/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 Jun 3, 2022
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: CecileRobertMichon

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 Jun 3, 2022
@CecileRobertMichon CecileRobertMichon mentioned this pull request Jun 3, 2022
3 tasks
@mboersma
Copy link
Contributor Author

mboersma commented Jun 3, 2022

the tests will just be stuck at the latest version that was published with the old naming until we fix them.

D'oh, you're right. I can take on that change to e2e logic.

@k8s-ci-robot k8s-ci-robot merged commit d96510d into kubernetes-sigs:main Jun 3, 2022
@k8s-ci-robot k8s-ci-robot added this to the v1.4 milestone Jun 3, 2022
@mboersma mboersma deleted the update-sku-naming branch June 3, 2022 17:06
@mboersma
Copy link
Contributor Author

mboersma commented Jun 6, 2022

/cherry-pick release-1.3

@k8s-infra-cherrypick-robot

@mboersma: new pull request created: #2357

In response to this:

/cherry-pick release-1.3

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
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/feature Categorizes issue or PR as related to a new feature. 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/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants