Merge pull request #2725 from k8s-infra-cherrypick-robot/cherry-pick-2708-to-release-1.5

[release-1.5] add tags for ssa changes

Author: k8s-ci-robot

Makefile

@@ -69,7 +69,7 @@ ifneq ($(abspath $(ROOT_DIR)),$(GOPATH)/src/sigs.k8s.io/cluster-api-provider-azu
 endif
 
 # Binaries.
-CONTROLLER_GEN_VER := v0.8.0
+CONTROLLER_GEN_VER := v0.9.2
 CONTROLLER_GEN_BIN := controller-gen
 CONTROLLER_GEN := $(TOOLS_BIN_DIR)/$(CONTROLLER_GEN_BIN)-$(CONTROLLER_GEN_VER)
 

api/v1alpha3/azurecluster_conversion.go

@@ -241,6 +241,7 @@ func Convert_v1alpha3_SubnetSpec_To_v1beta1_SubnetSpec(in *SubnetSpec, out *infr
 	}
 
 	// Convert SubnetClassSpec fields
+	out.Name = in.Name
 	out.Role = infrav1.SubnetRole(in.Role)
 	out.CIDRBlocks = in.CIDRBlocks
 
@@ -254,6 +255,7 @@ func Convert_v1beta1_SubnetSpec_To_v1alpha3_SubnetSpec(in *infrav1.SubnetSpec, o
 	}
 
 	// Convert SubnetClassSpec fields
+	out.Name = in.Name
 	out.Role = SubnetRole(in.Role)
 	out.CIDRBlocks = in.CIDRBlocks
 

api/v1alpha3/zz_generated.conversion.go

@@ -283,6 +283,7 @@ func Convert_v1alpha4_SubnetSpec_To_v1beta1_SubnetSpec(in *SubnetSpec, out *infr
 
 	// Convert SubnetClassSpec fields
 	out.Role = infrav1.SubnetRole(in.Role)
+	out.Name = in.Name
 	out.CIDRBlocks = in.CIDRBlocks
 
 	return nil
@@ -296,6 +297,7 @@ func Convert_v1beta1_SubnetSpec_To_v1alpha4_SubnetSpec(in *infrav1.SubnetSpec, o
 
 	// Convert SubnetClassSpec fields
 	out.Role = SubnetRole(in.Role)
+	out.Name = in.Name
 	out.CIDRBlocks = in.CIDRBlocks
 
 	return nil

api/v1alpha4/azurecluster_conversion.go

@@ -138,8 +138,8 @@ func (c *AzureCluster) setSubnetDefaults() {
 			SubnetClassSpec: SubnetClassSpec{
 				Role:       SubnetNode,
 				CIDRBlocks: []string{DefaultNodeSubnetCIDR},
+				Name:       generateNodeSubnetName(c.ObjectMeta.Name),
 			},
-			Name: generateNodeSubnetName(c.ObjectMeta.Name),
 			SecurityGroup: SecurityGroup{
 				Name: generateNodeSecurityGroupName(c.ObjectMeta.Name),
 			},