Merge pull request #969 from CecileRobertMichon/third-party-optional

k8s-ci-robot · web-flow · commit b28e91b9db52 · 2020-09-29T17:03:25.000-07:00
Make thirdPartyImage optional
diff --git a/api/v1alpha3/types.go b/api/v1alpha3/types.go
@@ -261,6 +261,7 @@ type AzureMarketplaceImage struct {
 	// ThirdPartyImage indicates the image is published by a third party publisher and a Plan
 	// will be generated for it.
 	// +kubebuilder:default=false
+	// +optional
 	ThirdPartyImage bool `json:"thirdPartyImage"`
 }
 
diff --git a/config/crd/bases/exp.infrastructure.cluster.x-k8s.io_azuremachinepools.yaml b/config/crd/bases/exp.infrastructure.cluster.x-k8s.io_azuremachinepools.yaml
@@ -189,7 +189,6 @@ spec:
                         - offer
                         - publisher
                         - sku
-                        - thirdPartyImage
                         - version
                         type: object
                       sharedGallery:
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_azuremachines.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_azuremachines.yaml
@@ -364,7 +364,6 @@ spec:
                     - offer
                     - publisher
                     - sku
-                    - thirdPartyImage
                     - version
                     type: object
                   sharedGallery:
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_azuremachinetemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_azuremachinetemplates.yaml
@@ -307,7 +307,6 @@ spec:
                             - offer
                             - publisher
                             - sku
-                            - thirdPartyImage
                             - version
                             type: object
                           sharedGallery:

Original file line number	Diff line number	Diff line change
`@@ -261,6 +261,7 @@ type AzureMarketplaceImage struct {`
`261`	`261`	`// ThirdPartyImage indicates the image is published by a third party publisher and a Plan`
`262`	`262`	`// will be generated for it.`
`263`	`263`	`// +kubebuilder:default=false`
	`264`	`+ // +optional`
`264`	`265`	ThirdPartyImage bool `json:"thirdPartyImage"`
`265`	`266`	`}`
`266`	`267`