Skip to content

Commit

Permalink
Merge pull request #1057 from patrickdillon/azure-machine-spec
Browse files Browse the repository at this point in the history
Bug 2023434: Add Purchase Plan Name to Azure Machine Provider Spec
  • Loading branch information
openshift-merge-robot authored Nov 19, 2021
2 parents 20da846 + 62d90f1 commit 4e474ed
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 0 deletions.
20 changes: 20 additions & 0 deletions machine/v1beta1/types_azureprovider.go
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,28 @@ type Image struct {
Version string `json:"version"`
// ResourceID specifies an image to use by ID
ResourceID string `json:"resourceID"`
// Type identifies the source of the image and related information, such as purchase plans.
// Valid values are "ID", "MarketplaceWithPlan", "MarketplaceNoPlan", and omitted, which
// means no opinion and the platform chooses a good default which may change over time.
// Currently that default is "MarketplaceNoPlan" if publisher data is supplied, or "ID" if not.
// For more information about purchase plans, see:
// https://docs.microsoft.com/en-us/azure/virtual-machines/linux/cli-ps-findimage#check-the-purchase-plan-information
// +optional
Type AzureImageType `json:"type,omitempty"`
}

// AzureImageType provides an enumeration for the valid image types.
type AzureImageType string

const (
// AzureImageTypeID specifies that the image should be referenced by its resource ID.
AzureImageTypeID AzureImageType = "ID"
// AzureImageTypeMarketplaceNoPlan are images available from the marketplace that do not require a purchase plan.
AzureImageTypeMarketplaceNoPlan AzureImageType = "MarketplaceNoPlan"
// AzureImageTypeMarketplaceWithPlan require a purchase plan. Upstream these images are referred to as "ThirdParty."
AzureImageTypeMarketplaceWithPlan AzureImageType = "MarketplaceWithPlan"
)

type OSDisk struct {
// OSType is the operating system type of the OS disk. Possible values include "Linux" and "Windows".
OSType string `json:"osType"`
Expand Down
1 change: 1 addition & 0 deletions machine/v1beta1/zz_generated.swagger_doc_generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 4e474ed

Please sign in to comment.