add assignAvailabilitySet to azure cloud (kubermatic#1014)

Signed-off-by: Moath Qasim <[email protected]>

Author: moadqassem

pkg/cloudprovider/provider/azure/provider.go

@@ -72,20 +72,21 @@ type config struct {
 	ClientID       string
 	ClientSecret   string
 
-	Location          string
-	ResourceGroup     string
-	VNetResourceGroup string
-	VMSize            string
-	VNetName          string
-	SubnetName        string
-	LoadBalancerSku   string
-	RouteTableName    string
-	AvailabilitySet   string
-	SecurityGroupName string
-	ImageID           string
-	Zones             []string
-	ImagePlan         *compute.Plan
-	ImageReference    *compute.ImageReference
+	Location              string
+	ResourceGroup         string
+	VNetResourceGroup     string
+	VMSize                string
+	VNetName              string
+	SubnetName            string
+	LoadBalancerSku       string
+	RouteTableName        string
+	AvailabilitySet       string
+	AssignAvailabilitySet *bool
+	SecurityGroupName     string
+	ImageID               string
+	Zones                 []string
+	ImagePlan             *compute.Plan
+	ImageReference        *compute.ImageReference
 
 	OSDiskSize   int32
 	DataDiskSize int32
@@ -278,6 +279,8 @@ func (p *provider) getConfig(s v1alpha1.ProviderSpec) (*config, *providerconfigt
 		return nil, nil, fmt.Errorf("failed to get the value of \"assignPublicIP\" field, error = %v", err)
 	}
 
+	c.AssignAvailabilitySet = rawCfg.AssignAvailabilitySet
+
 	c.AvailabilitySet, err = p.configVarResolver.GetConfigVarStringValue(rawCfg.AvailabilitySet)
 	if err != nil {
 		return nil, nil, fmt.Errorf("failed to get the value of \"availabilitySet\" field, error = %v", err)
@@ -582,7 +585,8 @@ func (p *provider) Create(machine *v1alpha1.Machine, data *cloudprovidertypes.Pr
 		Zones: &config.Zones,
 	}
 
-	if config.AvailabilitySet != "" {
+	if config.AssignAvailabilitySet == nil && config.AvailabilitySet != "" ||
+		config.AssignAvailabilitySet != nil && *config.AssignAvailabilitySet && config.AvailabilitySet != "" {
 		// Azure expects the full path to the resource
 		asURI := fmt.Sprintf("/subscriptions/%s/resourceGroups/%s/providers/Microsoft.Compute/availabilitySets/%s", config.SubscriptionID, config.ResourceGroup, config.AvailabilitySet)
 		vmSpec.VirtualMachineProperties.AvailabilitySet = &compute.SubResource{ID: to.StringPtr(asURI)}
@@ -816,6 +820,12 @@ func (p *provider) GetCloudConfig(spec v1alpha1.MachineSpec) (config string, nam
 		return "", "", fmt.Errorf("failed to parse config: %v", err)
 	}
 
+	var avSet string
+	if c.AssignAvailabilitySet == nil && c.AvailabilitySet != "" ||
+		c.AssignAvailabilitySet != nil && *c.AssignAvailabilitySet && c.AvailabilitySet != "" {
+		avSet = c.AvailabilitySet
+	}
+
 	cc := &azuretypes.CloudConfig{
 		Cloud:                      "AZUREPUBLICCLOUD",
 		TenantID:                   c.TenantID,
@@ -829,7 +839,7 @@ func (p *provider) GetCloudConfig(spec v1alpha1.MachineSpec) (config string, nam
 		SubnetName:                 c.SubnetName,
 		LoadBalancerSku:            c.LoadBalancerSku,
 		RouteTableName:             c.RouteTableName,
-		PrimaryAvailabilitySetName: c.AvailabilitySet,
+		PrimaryAvailabilitySetName: avSet,
 		SecurityGroupName:          c.SecurityGroupName,
 		UseInstanceMetadata:        true,
 	}

pkg/cloudprovider/provider/azure/types/types.go

@@ -27,19 +27,20 @@ type RawConfig struct {
 	ClientID       providerconfigtypes.ConfigVarString `json:"clientID,omitempty"`
 	ClientSecret   providerconfigtypes.ConfigVarString `json:"clientSecret,omitempty"`
 
-	Location          providerconfigtypes.ConfigVarString `json:"location"`
-	ResourceGroup     providerconfigtypes.ConfigVarString `json:"resourceGroup"`
-	VNetResourceGroup providerconfigtypes.ConfigVarString `json:"vnetResourceGroup"`
-	VMSize            providerconfigtypes.ConfigVarString `json:"vmSize"`
-	VNetName          providerconfigtypes.ConfigVarString `json:"vnetName"`
-	SubnetName        providerconfigtypes.ConfigVarString `json:"subnetName"`
-	LoadBalancerSku   providerconfigtypes.ConfigVarString `json:"loadBalancerSku"`
-	RouteTableName    providerconfigtypes.ConfigVarString `json:"routeTableName"`
-	AvailabilitySet   providerconfigtypes.ConfigVarString `json:"availabilitySet"`
-	SecurityGroupName providerconfigtypes.ConfigVarString `json:"securityGroupName"`
-	Zones             []string                            `json:"zones"`
-	ImagePlan         *ImagePlan                          `json:"imagePlan,omitempty"`
-	ImageReference    *ImageReference                     `json:"imageReference,omitempty"`
+	Location              providerconfigtypes.ConfigVarString `json:"location"`
+	ResourceGroup         providerconfigtypes.ConfigVarString `json:"resourceGroup"`
+	VNetResourceGroup     providerconfigtypes.ConfigVarString `json:"vnetResourceGroup"`
+	VMSize                providerconfigtypes.ConfigVarString `json:"vmSize"`
+	VNetName              providerconfigtypes.ConfigVarString `json:"vnetName"`
+	SubnetName            providerconfigtypes.ConfigVarString `json:"subnetName"`
+	LoadBalancerSku       providerconfigtypes.ConfigVarString `json:"loadBalancerSku"`
+	RouteTableName        providerconfigtypes.ConfigVarString `json:"routeTableName"`
+	AvailabilitySet       providerconfigtypes.ConfigVarString `json:"availabilitySet"`
+	AssignAvailabilitySet *bool                               `json:"assignAvailabilitySet"`
+	SecurityGroupName     providerconfigtypes.ConfigVarString `json:"securityGroupName"`
+	Zones                 []string                            `json:"zones"`
+	ImagePlan             *ImagePlan                          `json:"imagePlan,omitempty"`
+	ImageReference        *ImageReference                     `json:"imageReference,omitempty"`
 
 	ImageID        providerconfigtypes.ConfigVarString `json:"imageID"`
 	OSDiskSize     int32                               `json:"osDiskSize"`