Merge pull request #4029 from mikutas/3518

Add `targetType` field to IngressClassParams

Author: zac-nixon

apis/elbv2/v1beta1/ingressclassparams_types.go

@@ -152,6 +152,10 @@ type IngressClassParamsSpec struct {
 	// Tags defines list of Tags on AWS resources provisioned for Ingresses that belong to IngressClass with this IngressClassParams.
 	Tags []Tag `json:"tags,omitempty"`
 
+	// TargetType defines the target type of target groups for all Ingresses that belong to IngressClass with this IngressClassParams.
+	// +optional
+	TargetType TargetType `json:"targetType,omitempty"`
+
 	// LoadBalancerAttributes define the custom attributes to LoadBalancers for all Ingress that that belong to IngressClass with this IngressClassParams.
 	// +optional
 	LoadBalancerAttributes []Attribute `json:"loadBalancerAttributes,omitempty"`

config/crd/bases/elbv2.k8s.aws_ingressclassparams.yaml

@@ -261,6 +261,13 @@ spec:
                   - value
                   type: object
                 type: array
+              targetType:
+                description: TargetType defines the target type of target groups for
+                  all Ingresses that belong to IngressClass with this IngressClassParams.
+                enum:
+                - instance
+                - ip
+                type: string
             type: object
         type: object
     served: true

docs/guide/ingress/ingress_class.md

@@ -150,6 +150,15 @@ You can use IngressClassParams to enforce settings for a set of Ingresses.
       minimumLoadBalancerCapacity:
         capacityUnits: 1000
     ```
+    - with targetType
+    ```
+    apiVersion: elbv2.k8s.aws/v1beta1
+    kind: IngressClassParams
+    metadata:
+      name: class2048-config
+    spec:
+      targetType: ip
+    ```
 
 ### IngressClassParams specification
 
@@ -188,7 +197,7 @@ If the field is specified, LBC will ignore the `alb.ingress.kubernetes.io/inboun
 
 #### spec.certificateArn
 Cluster administrators can use the optional `certificateARN` field to specify the ARN of the certificates for all Ingresses that belong to IngressClass with this IngressClassParams.
-    
+
 If the field is specified, LBC will ignore the `alb.ingress.kubernetes.io/certificate-arn` annotation.
 
 #### spec.sslPolicy
@@ -235,6 +244,13 @@ Cluster administrators can use `tags` field to specify the custom tags for AWS r
     2. `spec.tags` in IngressClassParams will have the middle priority.
     3. `alb.ingress.kubernetes.io/tags` annotation will have the lowest priority.
 
+#### spec.targetType
+
+`targetType` is an optional setting. The available options are `instance` or `ip`.
+
+This defines the target type of target groups for all Ingresses that belong to IngressClass with this IngressClassParams.
+If the field is specified, LBC will ignore the `alb.ingress.kubernetes.io/target-type` annotation.
+
 #### spec.loadBalancerAttributes
 
 `loadBalancerAttributes` is an optional setting.

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

@@ -260,6 +260,13 @@ spec:
                   - value
                   type: object
                 type: array
+              targetType:
+                description: TargetType defines the target type of target groups for
+                  all Ingresses that belong to IngressClass with this IngressClassParams.
+                enum:
+                - instance
+                - ip
+                type: string
             type: object
         type: object
     served: true

pkg/ingress/model_build_target_group.go

@@ -151,7 +151,7 @@ func (t *defaultModelBuildTask) buildTargetGroupBindingNetworking(_ context.Cont
 func (t *defaultModelBuildTask) buildTargetGroupSpec(ctx context.Context,
 	ing ClassifiedIngress, svc *corev1.Service, port intstr.IntOrString, svcPort corev1.ServicePort) (elbv2model.TargetGroupSpec, error) {
 	svcAndIngAnnotations := algorithm.MergeStringMap(svc.Annotations, ing.Ing.Annotations)
-	targetType, err := t.buildTargetGroupTargetType(ctx, svcAndIngAnnotations)
+	targetType, err := t.buildTargetGroupTargetType(ctx, svcAndIngAnnotations, ing.IngClassConfig)
 	if err != nil {
 		return elbv2model.TargetGroupSpec{}, err
 	}
@@ -218,9 +218,12 @@ func (t *defaultModelBuildTask) buildTargetGroupName(_ context.Context,
 	return fmt.Sprintf("k8s-%.8s-%.8s-%.10s", sanitizedNamespace, sanitizedName, uuid)
 }
 
-func (t *defaultModelBuildTask) buildTargetGroupTargetType(_ context.Context, svcAndIngAnnotations map[string]string) (elbv2model.TargetType, error) {
+func (t *defaultModelBuildTask) buildTargetGroupTargetType(_ context.Context, svcAndIngAnnotations map[string]string, classCfg ClassConfiguration) (elbv2model.TargetType, error) {
 	rawTargetType := string(t.defaultTargetType)
 	_ = t.annotationParser.ParseStringAnnotation(annotations.IngressSuffixTargetType, &rawTargetType, svcAndIngAnnotations)
+	if classCfg.IngClassParams != nil && classCfg.IngClassParams.Spec.TargetType != "" {
+		rawTargetType = string(classCfg.IngClassParams.Spec.TargetType)
+	}
 	switch rawTargetType {
 	case string(elbv2model.TargetTypeInstance):
 		return elbv2model.TargetTypeInstance, nil