Set Gateway HTTPRoute status

Co-authored-by: Romain <rtribotte@users.noreply.github.com>
traefik · May 1, 2024 · 05d2c86 · 05d2c86
1 parent 9d8fd24
commit 05d2c86
Show file tree

Hide file tree

Showing 6 changed files with 1,287 additions and 1,175 deletions.
diff --git a/integration/k8s_conformance_test.go b/integration/k8s_conformance_test.go
@@ -195,40 +195,28 @@ func (s *K8sConformanceSuite) TestK8sGatewayAPIConformance() {
 			LatestObservedGenerationSet:       5 * time.Second,
 			RequiredConsecutiveSuccesses:      0,
 		},
-		SupportedFeatures: sets.New[ksuite.SupportedFeature]().
-			Insert(ksuite.GatewayCoreFeatures.UnsortedList()...).
-			Insert(ksuite.ReferenceGrantCoreFeatures.UnsortedList()...),
 		EnableAllSupportedFeatures: false,
 		RunTest:                    *k8sConformanceRunTest,
 		// Until the feature are all supported, following tests are skipped.
 		SkipTests: []string{
-			"HTTPExactPathMatching",
-			"HTTPRouteHostnameIntersection",
-			"HTTPRouteListenerHostnameMatching",
-			"HTTPRouteRequestHeaderModifier",
-			"GatewayClassObservedGenerationBump",
-			"HTTPRouteInvalidNonExistentBackendRef",
-			"GatewayWithAttachedRoutes",
-			"HTTPRouteCrossNamespace",
-			"HTTPRouteDisallowedKind",
-			"HTTPRouteInvalidReferenceGrant",
-			"HTTPRouteObservedGenerationBump",
-			"TLSRouteSimpleSameNamespace",
-			"TLSRouteInvalidReferenceGrant",
-			"HTTPRouteInvalidCrossNamespaceParentRef",
-			"HTTPRouteInvalidParentRefNotMatchingSectionName",
-			"GatewayModifyListeners",
-			"GatewayInvalidTLSConfiguration",
-			"HTTPRouteInvalidCrossNamespaceBackendRef",
-			"HTTPRouteMatchingAcrossRoutes",
-			"HTTPRoutePartiallyInvalidViaInvalidReferenceGrant",
-			"HTTPRouteRedirectHostAndStatus",
-			"HTTPRouteInvalidBackendRefUnknownKind",
-			"HTTPRoutePathMatchOrder",
-			"HTTPRouteSimpleSameNamespace",
-			"HTTPRouteMatching",
-			"HTTPRouteHeaderMatching",
-			"HTTPRouteReferenceGrant",
+			tests.GatewayClassObservedGenerationBump.ShortName,
+			tests.GatewayWithAttachedRoutes.ShortName,
+			tests.GatewayModifyListeners.ShortName,
+			tests.GatewayInvalidTLSConfiguration.ShortName,
+			tests.HTTPRouteHostnameIntersection.ShortName,
+			tests.HTTPRouteListenerHostnameMatching.ShortName,
+			tests.HTTPRouteInvalidNonExistentBackendRef.ShortName,
+			tests.HTTPRouteInvalidReferenceGrant.ShortName,
+			tests.HTTPRouteInvalidCrossNamespaceParentRef.ShortName,
+			tests.HTTPRouteInvalidParentRefNotMatchingSectionName.ShortName,
+			tests.HTTPRouteInvalidCrossNamespaceBackendRef.ShortName,
+			tests.HTTPRouteMatchingAcrossRoutes.ShortName,
+			tests.HTTPRoutePartiallyInvalidViaInvalidReferenceGrant.ShortName,
+			tests.HTTPRouteRedirectHostAndStatus.ShortName,
+			tests.HTTPRouteInvalidBackendRefUnknownKind.ShortName,
+			tests.HTTPRoutePathMatchOrder.ShortName,
+			tests.HTTPRouteHeaderMatching.ShortName,
+			tests.HTTPRouteReferenceGrant.ShortName,
 		},
 	}
 
@@ -241,10 +229,7 @@ func (s *K8sConformanceSuite) TestK8sGatewayAPIConformance() {
 			Version:      version.Version,
 			Contact:      []string{"@traefik/maintainers"},
 		},
-		ConformanceProfiles: sets.New[ksuite.ConformanceProfileName](
-			ksuite.HTTPConformanceProfileName,
-			ksuite.TLSConformanceProfileName,
-		),
+		ConformanceProfiles: sets.New(ksuite.HTTPConformanceProfileName),
 	})
 	require.NoError(s.T(), err)
 

diff --git a/pkg/provider/kubernetes/gateway/client.go b/pkg/provider/kubernetes/gateway/client.go
@@ -14,6 +14,7 @@ import (
 	kerror "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
+	ktypes "k8s.io/apimachinery/pkg/types"
 	kinformers "k8s.io/client-go/informers"
 	kclientset "k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
@@ -51,6 +52,7 @@ type Client interface {
 	GetGatewayClasses() ([]*gatev1.GatewayClass, error)
 	UpdateGatewayStatus(gateway *gatev1.Gateway, gatewayStatus gatev1.GatewayStatus) error
 	UpdateGatewayClassStatus(gatewayClass *gatev1.GatewayClass, condition metav1.Condition) error
+	UpdateHTTPRouteStatus(ctx context.Context, gateway *gatev1.Gateway, nsName ktypes.NamespacedName, status gatev1.HTTPRouteStatus) error
 	GetGateways() []*gatev1.Gateway
 	GetHTTPRoutes(namespaces []string) ([]*gatev1.HTTPRoute, error)
 	GetTCPRoutes(namespaces []string) ([]*gatev1alpha2.TCPRoute, error)
@@ -384,7 +386,7 @@ func (c *clientWrapper) GetGateways() []*gatev1.Gateway {
 	var result []*gatev1.Gateway
 
 	for ns, factory := range c.factoriesGateway {
-		gateways, err := factory.Gateway().V1().Gateways().Lister().List(labels.Everything())
+		gateways, err := factory.Gateway().V1().Gateways().Lister().Gateways(ns).List(labels.Everything())
 		if err != nil {
 			log.Error().Err(err).Msgf("Failed to list Gateways in namespace %s", ns)
 			continue
@@ -453,6 +455,46 @@ func (c *clientWrapper) UpdateGatewayStatus(gateway *gatev1.Gateway, gatewayStat
 	return nil
 }
 
+func (c *clientWrapper) UpdateHTTPRouteStatus(ctx context.Context, gateway *gatev1.Gateway, nsName ktypes.NamespacedName, status gatev1.HTTPRouteStatus) error {
+	if !c.isWatchedNamespace(nsName.Namespace) {
+		return fmt.Errorf("updating HTTPRoute status %s/%s: namespace is not within watched namespaces", nsName.Namespace, nsName.Name)
+	}
+
+	route, err := c.factoriesGateway[c.lookupNamespace(nsName.Namespace)].Gateway().V1().HTTPRoutes().Lister().HTTPRoutes(nsName.Namespace).Get(nsName.Name)
+	if err != nil {
+		return fmt.Errorf("getting HTTPRoute %s/%s: %w", nsName.Namespace, nsName.Name, err)
+	}
+
+	var statuses []gatev1.RouteParentStatus
+	for _, status := range route.Status.Parents {
+		if status.ControllerName != controllerName {
+			statuses = append(statuses, status)
+			continue
+		}
+		if status.ParentRef.Namespace != nil && string(*status.ParentRef.Namespace) != gateway.Namespace {
+			statuses = append(statuses, status)
+			continue
+		}
+		if string(status.ParentRef.Name) != gateway.Name {
+			statuses = append(statuses, status)
+			continue
+		}
+	}
+	statuses = append(statuses, status.Parents...)
+
+	route = route.DeepCopy()
+	route.Status = gatev1.HTTPRouteStatus{
+		RouteStatus: gatev1.RouteStatus{
+			Parents: statuses,
+		},
+	}
+
+	if _, err := c.csGateway.GatewayV1().HTTPRoutes(nsName.Namespace).UpdateStatus(ctx, route, metav1.UpdateOptions{}); err != nil {
+		return fmt.Errorf("updating HTTPRoute %s/%s status: %w", nsName.Namespace, nsName.Name, err)
+	}
+	return nil
+}
+
 func statusEquals(oldStatus, newStatus gatev1.GatewayStatus) bool {
 	if len(oldStatus.Listeners) != len(newStatus.Listeners) {
 		return false

diff --git a/pkg/provider/kubernetes/gateway/client_mock_test.go b/pkg/provider/kubernetes/gateway/client_mock_test.go