Resolve PR comments

youngnick · youngnick · commit 1a8d2feed553 · 2024-05-30T16:25:02.000+10:00
Signed-off-by: Nick Young &lt;nick@isovalent.com&gt;
diff --git a/Documentation/network/servicemesh/gateway-api/gamma.rst b/Documentation/network/servicemesh/gateway-api/gamma.rst
@@ -62,7 +62,8 @@ Cilium Gateway API Support
 ##########################
 
 Cilium supports GAMMA v1.0.0 for below resources, passes the Core conformance
-tests, and passes two out of three Extended Mesh tests.
+tests, and passes two out of three Extended Mesh tests. Note that GAMMA is itself
+experimental as at Gateway API v1.0.0.
 
 Cilium currently does not support "consumer" HTTPRoutes, and so does not
 support the ``MeshConsumerRoute`` feature of the Mesh conformance profile.
diff --git a/operator/pkg/gateway-api/httproute_gamma_reconcile.go b/operator/pkg/gateway-api/httproute_gamma_reconcile.go
@@ -32,19 +32,6 @@ import (
 // For more details, check Reconcile and its Result here:
 // - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.12.2/pkg/reconcile
 func (r *gammaHttpRouteReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
-	// TODO: This currently is copied from the HTTPRoute reconciler, which just
-	// checks that HTTPRoutes are good before marking them as okay.
-	// For GAMMA objects, we need to work more like the _Gateway_ reconciler
-	// which checks things, builds a model, then calls the translation function
-	// after populating the Input struct with the relevant objects from
-	// controller-runtime cache.
-
-	// FOR NOW, though, this should just log things and update status if they reconcile
-	// preferably with big GAMMA reconciler tags.
-	//
-	// Then, I write the ingestion part to ingest GAMMA stuff into a model
-	// Then, we test the translation part works
-	// Then we put it all in here.
 	scopedLog := log.WithContext(ctx).WithFields(logrus.Fields{
 		logfields.Controller: "gammaHttpRoute",
 		logfields.Resource:   req.NamespacedName,
diff --git a/operator/pkg/gateway-api/routechecks/gamma_checks.go b/operator/pkg/gateway-api/routechecks/gamma_checks.go
@@ -18,7 +18,7 @@ func CheckGammaServiceAllowedForNamespace(input Input, parentRef gatewayv1.Paren
 		input.SetParentCondition(parentRef, metav1.Condition{
 			Type:    "Accepted",
 			Status:  metav1.ConditionFalse,
-			Reason:  "Invalid" + input.GetGVK().Kind,
+			Reason:  "Invalid " + input.GetGVK().Kind,
 			Message: err.Error(),
 		})
 
diff --git a/operator/pkg/model/ingestion/gamma.go b/operator/pkg/model/ingestion/gamma.go
@@ -87,16 +87,15 @@ func GammaHTTPRoutes(input GammaInput) []model.HTTPListener {
 
 			parentSvc, err := getMatchingService(parentName.Name, parentName.Namespace, hr.GetNamespace(), input.Services)
 			if err != nil {
-				fmt.Printf("Can't find parent Service %s/%s in input\n", parentName.Namespace, parentName.Name)
+				log.Warnf("Can't find parent Service %s/%s in input", parentName.Namespace, parentName.Name)
 				continue
 			}
 
 			if parentSvc.GetName() == "" {
 				// skip processing this parent because it's not in the input.
 				// This situation should not arise - there should be multiple
 				// layers of protection.
-				// TODO: figure out how to handle this.
-				fmt.Printf("Can't find any parent Service in input\n")
+				log.Warn("Can't find any parent Service in input. This shouldn't happen.")
 				continue
 			}
 
