Merge pull request #1222 from ishankhare07/alb-target-group-arn

add fixed response config and target group ARN
loft-sh · Sep 22, 2023 · 4167783 · 4167783
2 parents 70970e9 + ac58d31
commit 4167783
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/pkg/controllers/resources/ingresses/syncer_test.go b/pkg/controllers/resources/ingresses/syncer_test.go
@@ -368,7 +368,7 @@ func TestSync(t *testing.T) {
 						Labels:    baseIngress.Labels,
 						Annotations: map[string]string{
 							"nginx.ingress.kubernetes.io/auth-secret":        "my-secret",
-							"alb.ingress.kubernetes.io/actions.testservice":  "{\"forwardConfig\":{\"targetGroups\":[{\"serviceName\":\"nginx-service\",\"servicePort\":\"80\",\"weight\":100}]}}",
+							"alb.ingress.kubernetes.io/actions.testservice":  `{"forwardConfig":{"targetGroups":[{"serviceName":"nginx-service","servicePort":"80","weight":100}]}}`,
 							"alb.ingress.kubernetes.io/actions.ssl-redirect": `{"type": "redirect", "redirectConfig": { "Protocol": "HTTPS", "Port": "443", "StatusCode": "HTTP_301"}}`,
 						},
 					},
@@ -391,7 +391,7 @@ func TestSync(t *testing.T) {
 							Namespace: baseIngress.Namespace,
 							Labels:    baseIngress.Labels,
 							Annotations: map[string]string{
-								"alb.ingress.kubernetes.io/actions.testservice":  "{\"forwardConfig\":{\"targetGroups\":[{\"serviceName\":\"nginx-service\",\"servicePort\":\"80\",\"weight\":100}]}}",
+								"alb.ingress.kubernetes.io/actions.testservice":  `{"forwardConfig":{"targetGroups":[{"serviceName":"nginx-service","servicePort":"80","weight":100}]}}`,
 								"alb.ingress.kubernetes.io/actions.ssl-redirect": `{"type": "redirect", "redirectConfig": { "Protocol": "HTTPS", "Port": "443", "StatusCode": "HTTP_301"}}`,
 								"nginx.ingress.kubernetes.io/auth-secret":        "my-secret",
 							},
@@ -412,7 +412,7 @@ func TestSync(t *testing.T) {
 								"vcluster.loft.sh/object-name":                                   baseIngress.Name,
 								"vcluster.loft.sh/object-namespace":                              baseIngress.Namespace,
 								translate.UIDAnnotation:                                          "",
-								"alb.ingress.kubernetes.io/actions.testservice-x-test-x-suffix":  "{\"forwardConfig\":{\"targetGroups\":[{\"serviceName\":\"nginx-service-x-test-x-suffix\",\"servicePort\":\"80\",\"weight\":100}]}}",
+								"alb.ingress.kubernetes.io/actions.testservice-x-test-x-suffix":  `{"forwardConfig":{"targetGroups":[{"serviceName":"nginx-service-x-test-x-suffix","servicePort":"80","weight":100}]}}`,
 								"alb.ingress.kubernetes.io/actions.ssl-redirect-x-test-x-suffix": `{"type":"redirect","forwardConfig":{},"redirectConfig":{"Port":"443","Protocol":"HTTPS","StatusCode":"HTTP_301"}}`,
 							},
 						},

diff --git a/pkg/controllers/resources/ingresses/util/util.go b/pkg/controllers/resources/ingresses/util/util.go
@@ -24,8 +24,10 @@ func getActionOrConditionValue(annotation, actionOrCondition string) string {
 
 // ref https://github.com/kubernetes-sigs/aws-load-balancer-controller/blob/main/pkg/ingress/config_types.go
 type actionPayload struct {
-	Type          string `json:"type,omitempty"`
-	ForwardConfig struct {
+	Type                string                 `json:"type,omitempty"`
+	TargetGroupARN      *string                `json:"targetGroupARN,omitempty"`
+	FixedResponseConfig map[string]interface{} `json:"fixedResponseConfig,omitempty"`
+	ForwardConfig       struct {
 		TargetGroups                []map[string]interface{} `json:"targetGroups,omitempty"`
 		TargetGroupStickinessConfig map[string]interface{}   `json:"targetGroupStickinessConfig,omitempty"`
 	} `json:"forwardConfig,omitempty"`