Add ComputeGallery field and add community galleries support #2277

invidian · 2022-05-02T20:59:58Z

What type of PR is this?

/kind feature

What this PR does / why we need it:

This PR adds support for creating machines using recently made available in public preview community galleries images, which can be shared between subscriptions and tenants, which makes it easier to share than publishing to marketplace.

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 #2267

Special notes for your reviewer:

Extracted from #1729, e2e tests are done there. Please let me know what kind of tests would you like to have added in this PR.

TODOs:

squashed commits
includes documentation
adds unit tests

Release note:

Added support for consuming community gallery images via new `ComputeGallery` field in `Image` reference field. It replaces `SharedGallery` field which is now deprecated.

azure/services/resourceskus/client.go

api/v1beta1/types.go

invidian · 2022-05-09T15:34:17Z

/retest

pull-cluster-api-provider-azure-e2e and pull-cluster-api-provider-azure-ci-entrypoint seems like a flake, pull-cluster-api-provider-azure-apidiff is expected to be failing as I indeed made an incompatible change on Go level to the type.

invidian · 2022-05-10T15:49:40Z

Something seems to be off with e2e tests, as they pass in #1729, which includes abf8c8f.

CecileRobertMichon · 2022-05-10T16:21:41Z

this is the error I'm seeing in logs

I0510 14:54:52.210761 1 recorder.go:103] events "msg"="Warning" "message"="failed to reconcile AzureMachine: failed to reconcile AzureMachine service virtualmachine: failed checking if the operation was complete: failed checking if the operation was complete: Code="ZonalAllocationFailed" Message="Allocation failed. We do not have sufficient capacity for the requested VM size in this zone. Read more about improving likelihood of allocation success at http://aka.ms/allocation-guidance\"" "object"={"kind":"AzureMachine","namespace":"capz-e2e-ahqhol","name":"capz-e2e-ahqhol-ha-control-plane-s7fj6","uid":"e50859a4-e0f4-4fe7-912b-04af5efdad05","apiVersion":"infrastructure.cluster.x-k8s.io/v1beta1","resourceVersion":"2898"} "reason"="ReconcileError"

:(

invidian · 2022-05-11T14:57:17Z

e2e tests are passing again :)

api/v1alpha3/azuremachine_conversion.go

api/v1alpha4/azuremachine_conversion.go

api/v1beta1/azureimage_validation.go

api/v1beta1/types.go

azure/converters/image.go

exp/api/v1beta1/azuremachinepool_webhook_test.go

invidian · 2022-05-12T08:50:03Z

Downloading helm fails on CI, though it works for me locally, let's try later...

api/v1beta1/types.go

CecileRobertMichon · 2022-05-13T20:48:33Z

cc @jsturtevant or @mboersma for a second pair of 👀

lgtm pending openAPI comment

CecileRobertMichon · 2022-05-16T21:29:52Z

/lgtm

agrawalkshitij

this sounds badly names, plan is different than pub/off/sku:
https://docs.microsoft.com/en-us/rest/api/compute/virtual-machines/create-or-update#plan

is this on prupose or outside of ur control to name this correctly?

docs/book/src/topics/custom-images.md

azure/converters/image.go

azure/converters/image_test.go

jsturtevant

this lgtm, pending one comment about the AzureMarketPlaceImage CRD.

exp/api/v1beta1/azuremachinepool_webhook_test.go

docs/book/src/topics/custom-images.md

CecileRobertMichon · 2022-06-15T15:39:55Z

lgtm pending 2 minor docs comments

Signed-off-by: Mateusz Gozdek <[email protected]>

To allow embedding it in newly added type for compute galleries. Signed-off-by: Mateusz Gozdek <[email protected]>

Azure has renamed Shared Image Gallery (SIG) to Azure Compute Gallery at some point, so this commit reflects that by introducing new type which also makes use of new ImagePlan struct to include plan information, which makes it share more code with other types and also treats ResourceGroup and SubscriptionID as string pointers as a preparation for adding community galleries support, which do not require those fields to be populated. This is done as a separate step to better highlight what consists of an actual community galleries support. Refs #2267 Signed-off-by: Mateusz Gozdek <[email protected]>

By reusing newly introduced ComputeGallery type fields. Refs #2267 Signed-off-by: Mateusz Gozdek <[email protected]>

Signed-off-by: Mateusz Gozdek <[email protected]>

k8s-ci-robot · 2022-06-15T15:58:36Z

@invidian: 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	`cd0350d`	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.

CecileRobertMichon · 2022-06-15T15:59:27Z

/lgtm

invidian · 2022-06-15T16:08:25Z

All conversations are resolved. Thanks for reviewing it again :)

jsturtevant · 2022-06-15T23:37:43Z

/lgtm

CecileRobertMichon · 2022-06-16T14:53:36Z

/approve

k8s-ci-robot · 2022-06-16T14:53:53Z

[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:

~~OWNERS~~ [CecileRobertMichon]

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 requested review from CecileRobertMichon and jackfrancis May 2, 2022 21:00

invidian commented May 2, 2022

View reviewed changes

azure/services/resourceskus/client.go Outdated Show resolved Hide resolved

invidian mentioned this pull request May 2, 2022

Add Flatcar Container Linux template #1729

Closed

3 tasks

jepio reviewed May 3, 2022

View reviewed changes

api/v1beta1/types.go Outdated Show resolved Hide resolved

CecileRobertMichon reviewed May 3, 2022

View reviewed changes

api/v1beta1/types.go Outdated Show resolved Hide resolved

k8s-ci-robot added 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 9, 2022

invidian requested a review from CecileRobertMichon May 9, 2022 09:46

k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels May 10, 2022

invidian mentioned this pull request May 10, 2022

[RFE] Offer Flatcar (and CAPI Flatcar) images via Azure Community Gallery flatcar/Flatcar#734

Closed

CecileRobertMichon reviewed May 11, 2022

View reviewed changes

jsturtevant reviewed May 12, 2022

View reviewed changes

api/v1beta1/types.go Show resolved Hide resolved

invidian requested a review from CecileRobertMichon May 13, 2022 09:41

k8s-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Jun 1, 2022

invidian requested a review from jsturtevant June 1, 2022 18:05

k8s-ci-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Jun 4, 2022

agrawalkshitij reviewed Jun 4, 2022

View reviewed changes

docs/book/src/topics/custom-images.md Outdated Show resolved Hide resolved

agrawalkshitij reviewed Jun 4, 2022

View reviewed changes

docs/book/src/topics/custom-images.md Show resolved Hide resolved

agrawalkshitij reviewed Jun 4, 2022

View reviewed changes

azure/converters/image.go Show resolved Hide resolved

agrawalkshitij reviewed Jun 4, 2022

View reviewed changes

azure/converters/image_test.go Show resolved Hide resolved

CecileRobertMichon added this to the v1.4 milestone Jun 9, 2022

jsturtevant reviewed Jun 15, 2022

View reviewed changes

exp/api/v1beta1/azuremachinepool_webhook_test.go Show resolved Hide resolved

docs/book/src/topics/custom-images.md Outdated Show resolved Hide resolved

invidian added 5 commits June 15, 2022 17:50

api/v1beta1: fix typo in function name

34b658e

Signed-off-by: Mateusz Gozdek <[email protected]>

api/v1beta1: extract Plan information from Marketplace image

40f1aeb

To allow embedding it in newly added type for compute galleries. Signed-off-by: Mateusz Gozdek <[email protected]>

Add Community Galleries support

fed4245

By reusing newly introduced ComputeGallery type fields. Refs #2267 Signed-off-by: Mateusz Gozdek <[email protected]>

api/v1beta1: improve error messages text

cd0350d

Signed-off-by: Mateusz Gozdek <[email protected]>

invidian requested a review from jsturtevant June 15, 2022 15:57

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 15, 2022

k8s-ci-robot assigned jsturtevant Jun 15, 2022

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 16, 2022

k8s-ci-robot merged commit 23ebb58 into kubernetes-sigs:main Jun 16, 2022

invidian deleted the invidian/community-galleries-support branch June 16, 2022 16:39

nprokopic mentioned this pull request Dec 18, 2022

Upstream update to v1.4.5 giantswarm/cluster-api-provider-azure-app#77

Merged

2 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add ComputeGallery field and add community galleries support #2277

Add ComputeGallery field and add community galleries support #2277

invidian commented May 2, 2022 •

edited

Loading

invidian commented May 9, 2022 •

edited

Loading

invidian commented May 10, 2022

CecileRobertMichon commented May 10, 2022

invidian commented May 11, 2022

invidian commented May 12, 2022

CecileRobertMichon commented May 13, 2022

CecileRobertMichon commented May 16, 2022

agrawalkshitij left a comment

jsturtevant left a comment

CecileRobertMichon commented Jun 15, 2022

k8s-ci-robot commented Jun 15, 2022

CecileRobertMichon commented Jun 15, 2022

invidian commented Jun 15, 2022

jsturtevant commented Jun 15, 2022

CecileRobertMichon commented Jun 16, 2022

k8s-ci-robot commented Jun 16, 2022

Add ComputeGallery field and add community galleries support #2277

Add ComputeGallery field and add community galleries support #2277

Conversation

invidian commented May 2, 2022 • edited Loading

invidian commented May 9, 2022 • edited Loading

invidian commented May 10, 2022

CecileRobertMichon commented May 10, 2022

invidian commented May 11, 2022

invidian commented May 12, 2022

CecileRobertMichon commented May 13, 2022

CecileRobertMichon commented May 16, 2022

agrawalkshitij left a comment

Choose a reason for hiding this comment

jsturtevant left a comment

Choose a reason for hiding this comment

CecileRobertMichon commented Jun 15, 2022

k8s-ci-robot commented Jun 15, 2022

CecileRobertMichon commented Jun 15, 2022

invidian commented Jun 15, 2022

jsturtevant commented Jun 15, 2022

CecileRobertMichon commented Jun 16, 2022

k8s-ci-robot commented Jun 16, 2022

invidian commented May 2, 2022 •

edited

Loading

invidian commented May 9, 2022 •

edited

Loading