Restore envoyproxy status checks

cnvergence · cnvergence · commit 5fe8c4ec9136 · 2023-08-30T21:47:49.000+02:00
Signed-off-by: Karol Szwaj &lt;karol.szwaj@gmail.com&gt;
diff --git a/internal/provider/kubernetes/controller.go b/internal/provider/kubernetes/controller.go
@@ -1458,6 +1458,9 @@ func (r *gatewayAPIReconciler) processParamsRef(ctx context.Context, gc *gwapiv1
 		return nil
 	}
 
+	found := false
+	valid := false
+	var validationErr error
 	for i := range epList.Items {
 		ep := epList.Items[i]
 		r.log.Info("processing envoyproxy", "namespace", ep.Namespace, "name", ep.Name)
@@ -1470,9 +1473,12 @@ func (r *gatewayAPIReconciler) processParamsRef(ctx context.Context, gc *gwapiv1
 				}
 				return nil
 			}
+			found = true
 			if err := validation.ValidateEnvoyProxy(&ep); err != nil {
-				return fmt.Errorf("invalid gatewayclass %s: %v", gc.Name, err)
+				validationErr = fmt.Errorf("invalid envoyproxy: %v", err)
+				continue
 			}
+			valid = true
 
 			if err := r.addFinalizer(ctx, &ep); err != nil {
 				r.log.Error(err, fmt.Sprintf("failed adding finalizer to envoy proxy %s",
@@ -1484,6 +1490,7 @@ func (r *gatewayAPIReconciler) processParamsRef(ctx context.Context, gc *gwapiv1
 			break
 		}
 
+		// Remove finalizer from EnvoyProxy when GatewayClass stops referencing it
 		if slice.ContainsString(ep.Finalizers, gatewayClassFinalizer) {
 			if err := r.removeFinalizer(ctx, &ep); err != nil {
 				r.log.Error(err, fmt.Sprintf("failed to remove finalizer from envoy proxy %s",
@@ -1494,6 +1501,14 @@ func (r *gatewayAPIReconciler) processParamsRef(ctx context.Context, gc *gwapiv1
 		}
 	}
 
+	if !found {
+		return fmt.Errorf("failed to find envoyproxy referenced by gatewayclass: %s", gc.Name)
+	}
+
+	if !valid {
+		return fmt.Errorf("invalid gatewayclass %s: %v", gc.Name, validationErr)
+	}
+
 	return nil
 }
 
diff --git a/internal/provider/kubernetes/controller_test.go b/internal/provider/kubernetes/controller_test.go
@@ -496,6 +496,30 @@ func TestProcessParamsRef(t *testing.T) {
 			},
 			expected: false,
 		},
+		{
+			name: "referenced envoyproxy does not exist",
+			gc: &gwapiv1b1.GatewayClass{
+				ObjectMeta: metav1.ObjectMeta{
+					Name: "test",
+				},
+				Spec: gwapiv1b1.GatewayClassSpec{
+					ControllerName: gcCtrlName,
+					ParametersRef: &gwapiv1b1.ParametersReference{
+						Group:     gwapiv1b1.Group(egcfgv1a1.GroupVersion.Group),
+						Kind:      gwapiv1b1.Kind(egcfgv1a1.KindEnvoyProxy),
+						Name:      "non-exist",
+						Namespace: gatewayapi.NamespacePtr(config.DefaultNamespace),
+					},
+				},
+			},
+			ep: &egcfgv1a1.EnvoyProxy{
+				ObjectMeta: metav1.ObjectMeta{
+					Namespace: config.DefaultNamespace,
+					Name:      "test",
+				},
+			},
+			expected: false,
+		},
 		{
 			name: "invalid gatewayclass parameters ref",
 			gc: &gwapiv1b1.GatewayClass{

Original file line number	Diff line number	Diff line change
`@@ -1458,6 +1458,9 @@ func (r gatewayAPIReconciler) processParamsRef(ctx context.Context, gc gwapiv1`
`1458`	`1458`	`return nil`
`1459`	`1459`	`}`
`1460`	`1460`
	`1461`	`+ found := false`
	`1462`	`+ valid := false`
	`1463`	`+ var validationErr error`
`1461`	`1464`	`for i := range epList.Items {`
`1462`	`1465`	`ep := epList.Items[i]`
`1463`	`1466`	`r.log.Info("processing envoyproxy", "namespace", ep.Namespace, "name", ep.Name)`
`@@ -1470,9 +1473,12 @@ func (r gatewayAPIReconciler) processParamsRef(ctx context.Context, gc gwapiv1`
`1470`	`1473`	`}`
`1471`	`1474`	`return nil`
`1472`	`1475`	`}`
	`1476`	`+ found = true`
`1473`	`1477`	`if err := validation.ValidateEnvoyProxy(&ep); err != nil {`
`1474`		`- return fmt.Errorf("invalid gatewayclass %s: %v", gc.Name, err)`
	`1478`	`+ validationErr = fmt.Errorf("invalid envoyproxy: %v", err)`
	`1479`	`+ continue`
`1475`	`1480`	`}`
	`1481`	`+ valid = true`
`1476`	`1482`
`1477`	`1483`	`if err := r.addFinalizer(ctx, &ep); err != nil {`
`1478`	`1484`	`r.log.Error(err, fmt.Sprintf("failed adding finalizer to envoy proxy %s",`
`@@ -1484,6 +1490,7 @@ func (r gatewayAPIReconciler) processParamsRef(ctx context.Context, gc gwapiv1`
`1484`	`1490`	`break`
`1485`	`1491`	`}`
`1486`	`1492`
	`1493`	`+ // Remove finalizer from EnvoyProxy when GatewayClass stops referencing it`
`1487`	`1494`	`if slice.ContainsString(ep.Finalizers, gatewayClassFinalizer) {`
`1488`	`1495`	`if err := r.removeFinalizer(ctx, &ep); err != nil {`
`1489`	`1496`	`r.log.Error(err, fmt.Sprintf("failed to remove finalizer from envoy proxy %s",`
`@@ -1494,6 +1501,14 @@ func (r gatewayAPIReconciler) processParamsRef(ctx context.Context, gc gwapiv1`
`1494`	`1501`	`}`
`1495`	`1502`	`}`
`1496`	`1503`
	`1504`	`+ if !found {`
	`1505`	`+ return fmt.Errorf("failed to find envoyproxy referenced by gatewayclass: %s", gc.Name)`
	`1506`	`+ }`
	`1507`	`+`
	`1508`	`+ if !valid {`
	`1509`	`+ return fmt.Errorf("invalid gatewayclass %s: %v", gc.Name, validationErr)`
	`1510`	`+ }`
	`1511`	`+`
`1497`	`1512`	`return nil`
`1498`	`1513`	`}`
`1499`	`1514`