Merge pull request #163 from backguynn/main

add ingressClassName in gateway API
loxilb-io · Aug 7, 2024 · 4ccd41a · 4ccd41a
2 parents a9c0114 + 1cc43f7
commit 4ccd41a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/pkg/agent/manager/gatewayapi/gateway.go b/pkg/agent/manager/gatewayapi/gateway.go
@@ -353,11 +353,7 @@ func (gm *GatewayManager) createIngressLbService(ctx context.Context, gateway *v
 	if newService.Spec.Selector == nil {
 		newService.Spec.Selector = map[string]string{}
 	}
-	newService.Spec.Selector["app.kubernetes.io/component"] = "controller"
-	//newService.Spec.Selector["app.kubernetes.io/instance"] = "loxilb-ingress"
-	//newService.Spec.Selector["app.kubernetes.io/name"] = "loxilb-ingress"
-	newService.Spec.Selector["app.kubernetes.io/instance"] = "ingress-nginx"
-	newService.Spec.Selector["app.kubernetes.io/name"] = "ingress-nginx"
+	newService.Spec.Selector["app"] = "loxilb-ingress-app"
 
 	svc, err = gm.kubeClient.CoreV1().Services(newService.Namespace).Create(ctx, &newService, metav1.CreateOptions{})
 	if err != nil {

diff --git a/pkg/agent/manager/gatewayapi/httproute.go b/pkg/agent/manager/gatewayapi/httproute.go
@@ -296,7 +296,7 @@ func (h *HTTPRouteManager) createIngress(ctx context.Context, httpRoute *v1.HTTP
 	newIngress.SetLabels(map[string]string{
 		"implementation": implementation,
 	})
-	ingressClass := "nginx"
+	ingressClass := "loxilb"
 	newIngress.Spec.IngressClassName = &ingressClass
 
 	// If the listener has a hostname, it takes precedence over httpRoute.
@@ -327,6 +327,13 @@ func (h *HTTPRouteManager) createIngress(ctx context.Context, httpRoute *v1.HTTP
 		for _, match := range rule.Matches {
 			for _, backref := range rule.BackendRefs {
 
+				if backref.Namespace != nil {
+					if newIngress.Namespace != string(*backref.Namespace) {
+						newIngress.Annotations["external-backend-service"] = "true"
+						newIngress.Annotations["service-"+string(backref.Name)+"-namespace"] = string(*backref.Namespace)
+					}
+				}
+
 				newIngressPath := netv1.HTTPIngressPath{
 					Backend: netv1.IngressBackend{
 						Service: &netv1.IngressServiceBackend{