Fixed a couple of bugs

Author: bigkraig

pkg/alb/lb/loadbalancer.go

@@ -38,6 +38,7 @@ type NewDesiredLoadBalancerOptions struct {
 	IngressAnnotations    *map[string]string
 	CommonTags            util.ELBv2Tags
 	IngressRules          []extensions.IngressRule
+	Resources             *albrgt.Resources
 	GetServiceNodePort    func(string, int32) (*int64, error)
 	GetServiceAnnotations func(string, string) (*map[string]string, error)
 	TargetsFunc           func(*string, string, string, *int64) albelbv2.TargetDescriptions
@@ -126,6 +127,7 @@ func NewDesiredLoadBalancer(o *NewDesiredLoadBalancerOptions) (newLoadBalancer *
 		GetServiceAnnotations: o.GetServiceAnnotations,
 		AnnotationFactory:     o.AnnotationFactory,
 		TargetsFunc:           o.TargetsFunc,
+		Resources:             o.Resources,
 	})
 
 	if err != nil {

pkg/alb/tg/targetgroups.go

@@ -122,6 +122,7 @@ type NewDesiredTargetGroupsOptions struct {
 	LoadBalancerID        string
 	ExistingTargetGroups  TargetGroups
 	AnnotationFactory     annotations.AnnotationFactory
+	Resources             *albrgt.Resources
 	IngressAnnotations    *map[string]string
 	ALBNamePrefix         string
 	Namespace             string
@@ -151,6 +152,7 @@ func NewDesiredTargetGroups(o *NewDesiredTargetGroupsOptions) (TargetGroups, err
 				Namespace:             o.Namespace,
 				ServiceName:           path.Backend.ServiceName,
 				GetServiceAnnotations: o.GetServiceAnnotations,
+				Resources:             o.Resources,
 			})
 			if err != nil {
 				return output, err
@@ -196,6 +198,7 @@ type mergeAnnotationsOptions struct {
 	Namespace             string
 	ServiceName           string
 	GetServiceAnnotations func(string, string) (*map[string]string, error)
+	Resources             *albrgt.Resources
 }
 
 func mergeAnnotations(o *mergeAnnotationsOptions) (*annotations.Annotations, error) {
@@ -217,6 +220,7 @@ func mergeAnnotations(o *mergeAnnotationsOptions) (*annotations.Annotations, err
 		Annotations: mergedAnnotations,
 		Namespace:   o.Namespace,
 		ServiceName: o.ServiceName,
+		Resources:   o.Resources,
 	})
 
 	if err != nil {

pkg/albingress/albingress.go

@@ -134,6 +134,7 @@ func NewALBIngressFromIngress(o *NewALBIngressFromIngressOptions) *ALBIngress {
 		GetServiceAnnotations: o.GetServiceAnnotations,
 		TargetsFunc:           o.TargetsFunc,
 		AnnotationFactory:     o.AnnotationFactory,
+		Resources:             o.Resources,
 	})
 
 	if err != nil {

pkg/annotations/annotations.go

@@ -493,7 +493,7 @@ func (a *Annotations) setSubnets(annotations map[string]string, clusterName stri
 	// if the subnet annotation isn't specified, lookup appropriate subnets to use
 	if annotations[subnetsKey] == "" {
 		subnets, err := albec2.ClusterSubnets(a.Scheme, clusterName, resources)
-		if err != nil {
+		if err == nil {
 			a.Subnets = subnets
 		}
 		return err

pkg/aws/albec2/ec2.go

@@ -772,14 +772,14 @@ func ClusterSubnets(scheme *string, clusterName string, resources *albrgt.Resour
 		}
 	}
 
-	if len(useableSubnets) < 2 {
+	if len(out) < 2 {
 		return nil, fmt.Errorf("Retrieval of subnets failed to resolve 2 qualified subnets. Subnets must "+
 			"contain the %s/%s tag with a value of shared or owned and the %s tag signifying it should be used for ALBs "+
 			"Additionally, there must be at least 2 subnets with unique availability zones as required by "+
 			"ALBs. Either tag subnets to meet this requirement or use the subnets annotation on the "+
 			"ingress resource to explicitly call out what subnets to use for ALB creation. The subnets "+
 			"that did resolve were %v.", tagNameCluster, clusterName, tagNameSubnetInternalELB,
-			log.Prettify(useableSubnets))
+			log.Prettify(out))
 	}
 
 	sort.Sort(out)