Renamed annotation to target-type and fixed tests

Author: bigkraig

docs/ingress-resources.md

@@ -62,7 +62,7 @@ alb.ingress.kubernetes.io/healthcheck-timeout-seconds
 alb.ingress.kubernetes.io/healthy-threshold-count
 alb.ingress.kubernetes.io/unhealthy-threshold-count
 alb.ingress.kubernetes.io/listen-ports
-alb.ingress.kubernetes.io/routing-target
+alb.ingress.kubernetes.io/target-type
 alb.ingress.kubernetes.io/security-groups
 alb.ingress.kubernetes.io/subnets
 alb.ingress.kubernetes.io/success-codes
@@ -97,7 +97,7 @@ Optional annotations are:
 
 - **listen-ports**: Defines the ports the ALB will expose. It defaults to `[{"HTTP": 80}]` unless a certificate ARN is defined, then it is `[{"HTTPS": 443}]`. Uses a format as follows '[{"HTTP":8080,"HTTPS": 443}]'.
 
-- **routing-target**: Defines if the EC2 instance ID or the pod IP is added to the Target Groups. Defaults to `instance`. Valid options are `instance` and `pod`. With `instance` the Target Group targets are `<ec2 instance id>:<node port>`, for `pod` the targets are `<pod ip>:<pod port>`. When using the pod IP, it will route from all availabilty zones. `pod` is to be used when the pod network is routable and can be reached by the ALB.
+- **target-type**: Defines if the EC2 instance ID or the pod IP is added to the Target Groups. Defaults to `instance`. Valid options are `instance` and `pod`. With `instance` the Target Group targets are `<ec2 instance id>:<node port>`, for `pod` the targets are `<pod ip>:<pod port>`. When using the pod IP, it will route from all availabilty zones. `pod` is to be used when the pod network is routable and can be reached by the ALB.
 
 - **security-groups**: [Security groups](http://docs.aws.amazon.com/AmazonVPC/latest/UserGuide/VPC_SecurityGroups.html) that should be applied to the ALB instance. These can be referenced by security group IDs or the name tag associated with each security group. Example ID values are `sg-723a380a,sg-a6181ede,sg-a5181edd`. Example tag values are `appSG, webSG`. When the annotation is not present, the controller will create a security group with appropriate ports allowing access to `0.0.0.0/0` and attached to the ALB. It will also create a security group for instances that allows all TCP traffic when the source is the security group created for the ALB.
 
@@ -136,7 +136,7 @@ alb.ingress.kubernetes.io/healthcheck-protocol
 alb.ingress.kubernetes.io/healthcheck-timeout-seconds
 alb.ingress.kubernetes.io/healthy-threshold-count
 alb.ingress.kubernetes.io/unhealthy-threshold-count
-alb.ingress.kubernetes.io/routing-target
+alb.ingress.kubernetes.io/target-type
 alb.ingress.kubernetes.io/success-codes
 alb.ingress.kubernetes.io/target-group-attributes
 ```

pkg/alb/rs/rule_test.go

@@ -170,6 +170,13 @@ func TestRuleReconcile(t *testing.T) {
 					},
 				},
 			},
+			CreateRuleOutput: elbv2.CreateRuleOutput{
+				Rules: []*elbv2.Rule{
+					&elbv2.Rule{
+						Priority: aws.String("1"),
+					},
+				},
+			},
 			Pass: true,
 		},
 		{ // test current rule is nil, desired rule exists, runs create
@@ -365,9 +372,10 @@ func genTG(arn, svcname string) *tg.TargetGroup {
 				Value: aws.String("namespace/" + svcname),
 			}}}},
 		TargetGroup: &elbv2.TargetGroup{
-			TargetGroupArn: aws.String(arn),
-			Port:           aws.Int64(8080),
-			Protocol:       aws.String("HTTP"),
+			TargetGroupName: aws.String("name"),
+			TargetGroupArn:  aws.String(arn),
+			Port:            aws.Int64(8080),
+			Protocol:        aws.String("HTTP"),
 		},
 	})
 	return t

pkg/alb/rs/rules_test.go

@@ -8,6 +8,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/elbv2"
 	"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/alb/tg"
+	"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/aws/albelbv2"
 	"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/util/log"
 )
 
@@ -180,8 +181,9 @@ func TestNewDesiredRules(t *testing.T) {
 
 func TestRulesReconcile(t *testing.T) {
 	cases := []struct {
-		Rules        Rules
-		OutputLength int
+		Rules            Rules
+		OutputLength     int
+		CreateRuleOutput elbv2.CreateRuleOutput
 	}{
 		{
 			Rules: Rules{
@@ -194,6 +196,13 @@ func TestRulesReconcile(t *testing.T) {
 				}),
 			},
 			OutputLength: 1,
+			CreateRuleOutput: elbv2.CreateRuleOutput{
+				Rules: []*elbv2.Rule{
+					&elbv2.Rule{
+						Priority: aws.String("1"),
+					},
+				},
+			},
 		},
 	}
 
@@ -206,6 +215,9 @@ func TestRulesReconcile(t *testing.T) {
 	}
 
 	for i, c := range cases {
+		albelbv2.ELBV2svc = mockedELBV2{
+			CreateRuleOutput: c.CreateRuleOutput,
+		}
 		rules, _ := c.Rules.Reconcile(rOpts)
 		if len(rules) != c.OutputLength {
 			t.Errorf("rules.Reconcile.%v output length %v, should be %v.", i, len(rules), c.OutputLength)

pkg/alb/tg/targetgroup.go

@@ -38,7 +38,7 @@ func NewDesiredTargetGroup(o *NewDesiredTargetGroupOptions) *TargetGroup {
 	hasher.Write([]byte(o.LoadBalancerID))
 
 	targetType := aws.String("instance")
-	if *o.Annotations.RoutingTarget == "pod" {
+	if *o.Annotations.TargetType == "pod" {
 		targetType = aws.String("ip")
 		hasher.Write([]byte(*targetType))
 	}

pkg/alb/tg/targetgroups.go

@@ -18,6 +18,9 @@ import (
 // TODO: This really needs to include port as well
 func (t TargetGroups) LookupBySvc(svc string) int {
 	for p, v := range t {
+		if v == nil {
+			continue
+		}
 		if v.SvcName == svc {
 			return p
 		}
@@ -164,7 +167,7 @@ func NewDesiredTargetGroups(o *NewDesiredTargetGroupsOptions) (TargetGroups, err
 				Logger:         o.Logger,
 				Namespace:      o.Namespace,
 				SvcName:        path.Backend.ServiceName,
-				Targets:        o.TargetsFunc(tgAnnotations.RoutingTarget, o.Namespace, path.Backend.ServiceName, port),
+				Targets:        o.TargetsFunc(tgAnnotations.TargetType, o.Namespace, path.Backend.ServiceName, port),
 			})
 
 			// If this target group is already defined, copy the current state to our new TG

pkg/annotations/annotations.go

@@ -47,7 +47,7 @@ const (
 	subnetsKey                    = "alb.ingress.kubernetes.io/subnets"
 	successCodesKey               = "alb.ingress.kubernetes.io/success-codes"
 	successCodesAltKey            = "alb.ingress.kubernetes.io/successCodes"
-	routingTargetKey              = "alb.ingress.kubernetes.io/routing-target"
+	targetTypeKey                 = "alb.ingress.kubernetes.io/target-type"
 	tagsKey                       = "alb.ingress.kubernetes.io/tags"
 	ignoreHostHeader              = "alb.ingress.kubernetes.io/ignore-host-header"
 	targetGroupAttributesKey      = "alb.ingress.kubernetes.io/target-group-attributes"
@@ -73,7 +73,7 @@ type Annotations struct {
 	Ports                      []PortData
 	Scheme                     *string
 	IPAddressType              *string
-	RoutingTarget              *string
+	TargetType                 *string
 	SecurityGroups             util.AWSStringSlice
 	Subnets                    util.Subnets
 	SuccessCodes               *string
@@ -151,7 +151,7 @@ func (vf *ValidatingAnnotationFactory) ParseAnnotations(opts *ParseAnnotationsOp
 		a.setPorts(annotations),
 		a.setScheme(annotations, opts.Namespace, opts.IngressName, vf.validator),
 		a.setIPAddressType(annotations),
-		a.setRoutingTarget(annotations),
+		a.setTargetType(annotations),
 		a.setSecurityGroups(annotations, vf.validator),
 		a.setSubnets(annotations, *vf.clusterName, vf.validator),
 		a.setSuccessCodes(annotations),
@@ -396,15 +396,15 @@ func (a *Annotations) setIPAddressType(annotations map[string]string) error {
 	return nil
 }
 
-func (a *Annotations) setRoutingTarget(annotations map[string]string) error {
+func (a *Annotations) setTargetType(annotations map[string]string) error {
 	switch {
-	case annotations[routingTargetKey] == "":
-		a.RoutingTarget = aws.String("instance")
+	case annotations[targetTypeKey] == "":
+		a.TargetType = aws.String("instance")
 		return nil
-	case annotations[routingTargetKey] != "instance" && annotations[routingTargetKey] != "pod":
-		return fmt.Errorf("ALB Routing Type [%v] must be either `instance` or `pod`", annotations[routingTargetKey])
+	case annotations[targetTypeKey] != "instance" && annotations[targetTypeKey] != "pod":
+		return fmt.Errorf("ALB Routing Type [%v] must be either `instance` or `pod`", annotations[targetTypeKey])
 	}
-	a.RoutingTarget = aws.String(annotations[routingTargetKey])
+	a.TargetType = aws.String(annotations[targetTypeKey])
 	return nil
 }