Added some missing configs to examples and catch a nil pointer

Author: bigkraig

examples/2048/2048-ingress.yaml

@@ -6,6 +6,7 @@ metadata:
   annotations:
     kubernetes.io/ingress.class: alb
     alb.ingress.kubernetes.io/scheme: internal
+    alb.ingress.kubernetes.io/target-type: pod
     alb.ingress.kubernetes.io/subnets: subnet-1234
     alb.ingress.kubernetes.io/security-groups: sg-1234
   labels:
@@ -18,4 +19,4 @@ spec:
       - path: /
         backend:
           serviceName: "service-2048"
-          servicePort: 80
+          servicePort: 80

examples/alb-ingress-controller.yaml

@@ -94,3 +94,5 @@ spec:
       restartPolicy: Always
       securityContext: {}
       terminationGracePeriodSeconds: 30
+      serviceAccountName: alb-ingress
+      serviceAccount: alb-ingress

pkg/alb/tg/targetgroup.go

@@ -177,6 +177,9 @@ func (t *TargetGroup) Reconcile(rOpts *ReconcileOptions) error {
 			*t.tg.current.TargetGroupArn,
 			*t.tg.current.TargetGroupName)
 
+	case t.tg.desired == nil && rOpts.IgnoreDeletes:
+		return nil
+
 		// No CurrentState means target group doesn't exist in AWS and should be created.
 	case t.tg.current == nil:
 		t.logger.Infof("Start TargetGroup creation.")

pkg/annotations/validation.go

@@ -14,6 +14,7 @@ import (
 	"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/aws/albiam"
 	"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/aws/albwaf"
 	"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/config"
+	"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/util/log"
 	util "github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/util/types"
 )
 
@@ -41,7 +42,7 @@ func NewConcreteValidator() ConcreteValidator {
 func (v ConcreteValidator) ResolveVPCValidateSubnets(a *Annotations) error {
 	VPCID, err := albec2.EC2svc.GetVPCID()
 	if err != nil {
-		return fmt.Errorf("subnets %s were invalid, could not resolve to a VPC", a.Subnets)
+		return fmt.Errorf("subnets %s were invalid, could not resolve to a VPC: %s", log.Prettify(a.Subnets), err.Error())
 	}
 	a.VPCID = VPCID
 

pkg/controller/alb-controller.go

@@ -464,9 +464,9 @@ func (ac *albController) GetTargets(mode *string, namespace string, svc string,
 				for _, addr := range subset.Addresses {
 					for _, port := range subset.Ports {
 						result = append(result, &elbv2.TargetDescription{
-							Id:               aws.String(addr.IP),
-							Port:             aws.Int64(int64(port.Port)),
-							AvailabilityZone: aws.String("all"),
+							Id:   aws.String(addr.IP),
+							Port: aws.Int64(int64(port.Port)),
+							// AvailabilityZone: aws.String("all"),
 						})
 					}
 				}