diff --git a/pkg/templates/machinecontroller/cloudprovider_specs.go b/pkg/templates/machinecontroller/cloudprovider_specs.go index c0078c013..59a2b7478 100644 --- a/pkg/templates/machinecontroller/cloudprovider_specs.go +++ b/pkg/templates/machinecontroller/cloudprovider_specs.go @@ -121,6 +121,7 @@ type AzureSpec struct { RouteTableName string `json:"routeTableName"` SecurityGroupName string `json:"securityGroupName"` Zones []string `json:"zones"` + ImagePlan *AzureImagePlan `json:"imagePlan"` SubnetName string `json:"subnetName"` Tags map[string]string `json:"tags"` VMSize string `json:"vmSize"` @@ -129,3 +130,9 @@ type AzureSpec struct { OSDiskSize int `json:"osDiskSize"` DataDiskSize int `json:"dataDiskSize"` } + +type AzureImagePlan struct { + Name string `json:"name,omitempty"` + Publisher string `json:"publisher,omitempty"` + Product string `json:"product,omitempty"` +} diff --git a/pkg/templates/machinecontroller/deployment.go b/pkg/templates/machinecontroller/deployment.go index 2ddc0852e..3d154b4f4 100644 --- a/pkg/templates/machinecontroller/deployment.go +++ b/pkg/templates/machinecontroller/deployment.go @@ -46,7 +46,7 @@ const ( MachineControllerNamespace = metav1.NamespaceSystem MachineControllerAppLabelKey = "app" MachineControllerAppLabelValue = "machine-controller" - MachineControllerTag = "v1.14.3" + MachineControllerTag = "v1.15.1" ) // Deploy deploys MachineController deployment with RBAC on the cluster diff --git a/pkg/terraform/v1beta1/config.go b/pkg/terraform/v1beta1/config.go index f763f3c0c..06ef72e59 100644 --- a/pkg/terraform/v1beta1/config.go +++ b/pkg/terraform/v1beta1/config.go @@ -274,6 +274,7 @@ func (c *Config) updateAzureWorkerset(existingWorkerSet *kubeonev1beta1.DynamicW {key: "routeTableName", value: azureCloudConfig.RouteTableName}, {key: "securityGroupName", value: azureCloudConfig.SecurityGroupName}, {key: "zones", value: azureCloudConfig.Zones}, + {key: "imagePlan", value: azureCloudConfig.ImagePlan}, {key: "subnetName", value: azureCloudConfig.SubnetName}, {key: "tags", value: azureCloudConfig.Tags}, {key: "vmSize", value: azureCloudConfig.VMSize}, @@ -495,6 +496,11 @@ func setWorkersetFlag(w *kubeonev1beta1.DynamicWorkerConfig, name string, value if s == nil { return nil } + case machinecontroller.AzureImagePlan: + case *machinecontroller.AzureImagePlan: + if s == nil { + return nil + } default: return errors.New("unsupported type") }