Make vpcid optional

Author: ikosenn

helm/aws-load-balancer-controller/crds/crds.yaml

@@ -587,6 +587,10 @@ spec:
                 - instance
                 - ip
                 type: string
+              vpcId:
+                description: VpcId is the VPC of the TargetGroup. If unspecified,
+                  it will be automatically inferred.
+                type: string
             required:
             - serviceRef
             - targetGroupARN

pkg/targetgroupbinding/resource_manager.go

@@ -386,7 +386,7 @@ func (m *defaultResourceManager) deregisterTargets(ctx context.Context, tgARN st
 func (m *defaultResourceManager) registerPodEndpoints(ctx context.Context, tgARN, tgVpcId string, endpoints []backend.PodEndpoint) error {
 	vpcId := m.vpcID
 	// Target group is in a different VPC from the cluster's VPC
-	if tgVpcId != m.vpcID {
+	if tgVpcId != "" && tgVpcId != m.vpcID {
 		vpcId = tgVpcId
 	}
 	vpcInfo, err := m.vpcInfoProvider.FetchVPCInfo(ctx, vpcId)

webhooks/elbv2/targetgroupbinding_mutator_test.go

@@ -41,7 +41,7 @@ func Test_targetGroupBindingMutator_MutateCreate(t *testing.T) {
 		wantErr error
 	}{
 		{
-			name: "targetGroupBinding with TargetType and ipAddressType already set",
+			name: "targetGroupBinding with TargetType and ipAddressType and vpcId already set",
 			fields: fields{
 				describeTargetGroupsAsListCalls: nil,
 			},
@@ -51,6 +51,7 @@ func Test_targetGroupBindingMutator_MutateCreate(t *testing.T) {
 						TargetGroupARN: "tg-1",
 						TargetType:     &instanceTargetType,
 						IPAddressType:  &targetGroupIPAddressTypeIPv4,
+						VpcId:          "vpcid-01",
 					},
 				},
 			},
@@ -59,6 +60,7 @@ func Test_targetGroupBindingMutator_MutateCreate(t *testing.T) {
 					TargetGroupARN: "tg-1",
 					TargetType:     &instanceTargetType,
 					IPAddressType:  &targetGroupIPAddressTypeIPv4,
+					VpcId:          "vpcid-01",
 				},
 			},
 		},
@@ -166,6 +168,7 @@ func Test_targetGroupBindingMutator_MutateCreate(t *testing.T) {
 						TargetGroupARN: "tg-1",
 						TargetType:     &instanceTargetType,
 						IPAddressType:  &targetGroupIPAddressTypeIPv6,
+						VpcId:          "vpcid-01",
 					},
 				},
 			},
@@ -174,6 +177,7 @@ func Test_targetGroupBindingMutator_MutateCreate(t *testing.T) {
 					TargetGroupARN: "tg-1",
 					TargetType:     &instanceTargetType,
 					IPAddressType:  &targetGroupIPAddressTypeIPv6,
+					VpcId:          "vpcid-01",
 				},
 			},
 		},

webhooks/elbv2/targetgroupbinding_validator.go

@@ -86,9 +86,6 @@ func (v *targetGroupBindingValidator) checkRequiredFields(tgb *elbv2api.TargetGr
 	if tgb.Spec.TargetType == nil {
 		absentRequiredFields = append(absentRequiredFields, "spec.targetType")
 	}
-	if tgb.Spec.VpcId == "" {
-		absentRequiredFields = append(absentRequiredFields, "spec.vpcId")
-	}
 	if len(absentRequiredFields) != 0 {
 		return errors.Errorf("%s must specify these fields: %s", "TargetGroupBinding", strings.Join(absentRequiredFields, ","))
 	}
@@ -162,6 +159,9 @@ func (v *targetGroupBindingValidator) checkTargetGroupIPAddressType(ctx context.
 
 // checkTargetGroupVpcId ensures VpcId matches with that on the AWS target group
 func (v *targetGroupBindingValidator) checkTargetGroupVpcId(ctx context.Context, tgb *elbv2api.TargetGroupBinding) error {
+	if tgb.Spec.VpcId == "" {
+		return nil
+	}
 	vpcId, err := v.getVpcIdFromAWS(ctx, tgb.Spec.TargetGroupARN)
 	if err != nil {
 		return errors.Wrap(err, "unable to get target group VpcId")