Add VM Support for Marketplace Purchase Plans #242
Conversation
openshift-ci
bot
added
do-not-merge/work-in-progress
| if image.Publisher == "" || image.SKU == "" || image.Offer == "" { | ||
| return nil |
There was a problem hiding this comment.
Do we care about the version? IIRC the upstream implementation cared about versions and put those into the plan? I could be mistaken though
There was a problem hiding this comment.
We don't care about version in the plan.
https://github.com/kubernetes-sigs/cluster-api-provider-azure/blob/d2b4e8ed2313adc270a0911d9d0c64e344f34cc4/azure/services/virtualmachines/virtualmachines.go#L278
| { | ||
| name: "Non-ThirdParty Marketplace Image", | ||
| updateSpec: nil, | ||
| validate: func(g *WithT, vm *compute.VirtualMachine) { | ||
| g.Expect(vm.Plan).To(BeNil()) | ||
| }, | ||
| }, | ||
| { | ||
| name: "ThirdParty Marketplace Image", | ||
| updateSpec: func(vmSpec *Spec) { | ||
| vmSpec.Image.ThirdPartyImage = true | ||
| }, | ||
| validate: func(g *WithT, vm *compute.VirtualMachine) { | ||
| g.Expect(vm.Plan).ToNot(BeNil()) | ||
|
|
||
| }, | ||
| }, |
There was a problem hiding this comment.
Should we add a ShareImageGallery test as well?
There was a problem hiding this comment.
Just removed support for Image Galleries from the API. Apparently we are only doing marketplace images.
patrickdillon
force-pushed
the
azure-marketplace
branch
3 times, most recently
from
2657e50 to
9d81790
Compare
patrickdillon
force-pushed
the
azure-marketplace
branch
from
9d81790 to
ab86a7b
Compare
patrickdillon
changed the title
openshift-ci
bot
removed
the
do-not-merge/work-in-progress
|
/hold cancel |
openshift-ci
bot
removed
the
do-not-merge/hold
VMs created from images in the marketplace or shared galleries may require purchase plans. This adds logic to pass through specified plan data when appropriate.
New image type field in the machine provider spec.
patrickdillon
force-pushed
the
azure-marketplace
branch
from
ab86a7b to
456fa68
Compare
|
/retest |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: JoelSpeed 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 |
openshift-ci
bot
added
the
approved
4 participants
VMs created from images in the marketplace or shared galleries may require purchase plans. This adds logic to pass through specified plan data when appropriate.
Simplified version of this upstream logic: https://github.com/kubernetes-sigs/cluster-api-provider-azure/blob/d2b4e8ed2313adc270a0911d9d0c64e344f34cc4/azure/services/virtualmachines/virtualmachines.go#L259-L287
/hold
Depends on openshift/api#1057