Merge pull request #1027 from brandonbell/bugfix/secondyCidrBlocks

Pass required RangeName to compute.SubnetworkSecondaryRange

Author: k8s-ci-robot

cloud/scope/cluster.go

@@ -212,8 +212,8 @@ func (s *ClusterScope) SubnetSpecs() []*compute.Subnetwork {
 	subnets := []*compute.Subnetwork{}
 	for _, subnetwork := range s.GCPCluster.Spec.Network.Subnets {
 		secondaryIPRanges := []*compute.SubnetworkSecondaryRange{}
-		for _, secondaryCidrBlock := range subnetwork.SecondaryCidrBlocks {
-			secondaryIPRanges = append(secondaryIPRanges, &compute.SubnetworkSecondaryRange{IpCidrRange: secondaryCidrBlock})
+		for rangeName, secondaryCidrBlock := range subnetwork.SecondaryCidrBlocks {
+			secondaryIPRanges = append(secondaryIPRanges, &compute.SubnetworkSecondaryRange{RangeName: rangeName, IpCidrRange: secondaryCidrBlock})
 		}
 		subnets = append(subnets, &compute.Subnetwork{
 			Name:                  subnetwork.Name,

cloud/scope/managedcluster.go

@@ -212,8 +212,8 @@ func (s *ManagedClusterScope) SubnetSpecs() []*compute.Subnetwork {
 	subnets := []*compute.Subnetwork{}
 	for _, subnetwork := range s.GCPManagedCluster.Spec.Network.Subnets {
 		secondaryIPRanges := []*compute.SubnetworkSecondaryRange{}
-		for _, secondaryCidrBlock := range subnetwork.SecondaryCidrBlocks {
-			secondaryIPRanges = append(secondaryIPRanges, &compute.SubnetworkSecondaryRange{IpCidrRange: secondaryCidrBlock})
+		for rangeName, secondaryCidrBlock := range subnetwork.SecondaryCidrBlocks {
+			secondaryIPRanges = append(secondaryIPRanges, &compute.SubnetworkSecondaryRange{RangeName: rangeName, IpCidrRange: secondaryCidrBlock})
 		}
 		subnets = append(subnets, &compute.Subnetwork{
 			Name:                  subnetwork.Name,