add unit tests and fix annotation-based forward (kubernetes-sigs#1507)

Author: M00nF1sh

controllers/ingress/group_controller.go

@@ -148,7 +148,7 @@ func (r *groupReconciler) buildAndDeployModel(ctx context.Context, ingGroup ingr
 	if err := r.stackDeployer.Deploy(ctx, stack); err != nil {
 		return nil, nil, err
 	}
-	r.logger.Info("successfully deployed model")
+	r.logger.Info("successfully deployed model", "ingressGroup", ingGroup.ID)
 	return stack, lb, err
 }
 

controllers/service/service_controller.go

@@ -99,7 +99,7 @@ func (r *serviceReconciler) buildAndDeployModel(ctx context.Context, svc *corev1
 	if err = r.stackDeployer.Deploy(ctx, stack); err != nil {
 		return nil, nil, err
 	}
-	r.logger.Info("successfully deployed model")
+	r.logger.Info("successfully deployed model", "service", k8s.NamespacedName(svc))
 
 	return stack, lb, nil
 }

docs/guide/ingress/annotations.md

@@ -199,7 +199,7 @@ Traffic Routing can be controlled with following annotations:
             alb.ingress.kubernetes.io/actions.forward-single-tg: >
               {"type":"forward","targetGroupARN": "arn-of-your-target-group"}
             alb.ingress.kubernetes.io/actions.forward-multiple-tg: >
-              {"type":"forward","forwardConfig":{"targetGroups":[{"serviceName":"service-1","servicePort":"80","weight":20},{"serviceName":"service-2","servicePort":"80","weight":20},{"targetGroupARN":"arn-of-your-non-k8s-target-group","weight":60}],"targetGroupStickinessConfig":{"enabled":true,"durationSeconds":200}}}
+              {"type":"forward","forwardConfig":{"targetGroups":[{"serviceName":"service-1","servicePort":"http","weight":20},{"serviceName":"service-2","servicePort":80,"weight":20},{"targetGroupARN":"arn-of-your-non-k8s-target-group","weight":60}],"targetGroupStickinessConfig":{"enabled":true,"durationSeconds":200}}}
         spec:
           rules:
             - http:

mocks/ingress/mock_cert_discovery.go

@@ -276,7 +276,7 @@ func (c *QueryStringKeyValuePair) validate() error {
 // Information about a query string condition.
 type QueryStringConditionConfig struct {
 	// One or more key/value pairs or values to find in the query string.
-	Values []*QueryStringKeyValuePair `json:"values"`
+	Values []QueryStringKeyValuePair `json:"values"`
 }
 
 func (c *QueryStringConditionConfig) validate() error {

mocks/networking/mock_subnet_resolver.go

@@ -102,6 +102,18 @@ func (b *defaultEnhancedBackendBuilder) buildActionViaAnnotation(_ context.Conte
 		}
 		action.TargetGroupARN = nil
 	}
+
+	// normalize servicePort to be int type if possible.
+	// this is for backwards-compatibility with old AWSALBIngressController, where ServicePort is defined as Type string.
+	if action.Type == ActionTypeForward && action.ForwardConfig != nil {
+		for _, tgt := range action.ForwardConfig.TargetGroups {
+			if tgt.ServicePort != nil {
+				normalizedSVCPort := intstr.Parse(tgt.ServicePort.String())
+				*tgt.ServicePort = normalizedSVCPort
+			}
+		}
+	}
+
 	return action, nil
 }