AV-206839 Gateway status fixes

ako-gateway-api/status/gateway_status.go

@@ -17,6 +17,7 @@ package status
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"reflect"
 	"strings"
 
@@ -159,13 +160,12 @@ func (o *gateway) Update(key string, option status.StatusOptions) {
 	conditionStatus := metav1.ConditionTrue
 
 	if option.Options.Message != "" {
-		conditionType = string(gatewayv1.GatewayConditionAccepted)
+		conditionType = string(gatewayv1.GatewayConditionProgrammed)
 		conditionStatus = metav1.ConditionFalse
 		reason = string(gatewayv1.GatewayReasonInvalid)
 		message = option.Options.Message
 	} else {
 		conditionType = string(gatewayv1.GatewayConditionProgrammed)
-		conditionStatus = metav1.ConditionTrue
 		reason = string(gatewayv1.GatewayReasonProgrammed)
 		message = "Virtual service configured/updated"
 	}
@@ -180,9 +180,9 @@ func (o *gateway) Update(key string, option status.StatusOptions) {
 	for i := range gatewaystatus.Listeners {
 		listenerCondition := NewCondition()
 		listenerCondition.
-			Type(conditionType).
+			Type(string(gatewayv1.ListenerConditionProgrammed)).
 			Status(conditionStatus).
-			Reason(reason).
+			Reason(string(gatewayv1.ListenerReasonProgrammed)).
 			ObservedGeneration(gw.ObjectMeta.Generation).
 			Message(message).
 			SetIn(&gatewaystatus.Listeners[i].Conditions)
@@ -225,31 +225,31 @@ func (o *gateway) Patch(key string, obj runtime.Object, status *status.Status, r
 		retry = retryNum[0]
 		if retry >= 5 {
 			utils.AviLog.Errorf("key: %s, msg: Patch retried 5 times, aborting", key)
-			return
+			return obj, errors.New("Patch retried 5 times, aborting")
 		}
 	}
 
 	gw := obj.(*gatewayv1.Gateway)
 	if o.isStatusEqual(&gw.Status, status.GatewayStatus) {
-		return
+		return obj, nil
 	}
 
 	patchPayload, _ := json.Marshal(map[string]interface{}{
 		"status": status.GatewayStatus,
 	})
-	_, err := akogatewayapilib.AKOControlConfig().GatewayAPIClientset().GatewayV1().Gateways(gw.Namespace).Patch(context.TODO(), gw.Name, types.MergePatchType, patchPayload, metav1.PatchOptions{}, "status")
+	updatedGateway, err := akogatewayapilib.AKOControlConfig().GatewayAPIClientset().GatewayV1().Gateways(gw.Namespace).Patch(context.TODO(), gw.Name, types.MergePatchType, patchPayload, metav1.PatchOptions{}, "status")
 	if err != nil {
 		utils.AviLog.Warnf("key: %s, msg: there was an error in updating the gateway status. err: %+v, retry: %d", key, err, retry)
 		updatedGW, err := akogatewayapilib.AKOControlConfig().GatewayApiInformers().GatewayInformer.Lister().Gateways(gw.Namespace).Get(gw.Name)
 		if err != nil {
 			utils.AviLog.Warnf("gateway not found %v", err)
-			return
+			return updatedGW, err
 		}
-		o.Patch(key, updatedGW, status, retry+1)
-		return
+		return o.Patch(key, updatedGW, status, retry+1)
 	}
 
 	utils.AviLog.Infof("key: %s, msg: Successfully updated the gateway %s/%s status %+v", key, gw.Namespace, gw.Name, utils.Stringify(status))
+	return updatedGateway, nil
 }
 
 func (o *gateway) isStatusEqual(old, new *gatewayv1.GatewayStatus) bool {

ako-gateway-api/status/gatewayclass_status.go

@@ -17,6 +17,7 @@ package status
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"reflect"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -78,31 +79,30 @@ func (o *gatewayClass) Patch(key string, obj runtime.Object, status *status.Stat
 		retry = retryNum[0]
 		if retry >= 5 {
 			utils.AviLog.Errorf("key: %s, msg: Patch retried 5 times, aborting", key)
-			return
+			return obj, errors.New("Patch retried 5 times, aborting")
 		}
 	}
 
 	gatewayClass := obj.(*gatewayv1.GatewayClass)
 	if o.isStatusEqual(&gatewayClass.Status, status.GatewayClassStatus) {
-		return
+		return obj, nil
 	}
 
 	patchPayload, _ := json.Marshal(map[string]interface{}{
 		"status": status.GatewayClassStatus,
 	})
-	_, err := akogatewayapilib.AKOControlConfig().GatewayAPIClientset().GatewayV1().GatewayClasses().Patch(context.TODO(), gatewayClass.Name, types.MergePatchType, patchPayload, metav1.PatchOptions{}, "status")
+	updatedObject, err := akogatewayapilib.AKOControlConfig().GatewayAPIClientset().GatewayV1().GatewayClasses().Patch(context.TODO(), gatewayClass.Name, types.MergePatchType, patchPayload, metav1.PatchOptions{}, "status")
 	if err != nil {
 		utils.AviLog.Warnf("key: %s, msg: there was an error in updating the GatewayClass status. err: %+v, retry: %d", key, err, retry)
 		updatedObj, err := akogatewayapilib.AKOControlConfig().GatewayApiInformers().GatewayClassInformer.Lister().Get(gatewayClass.Name)
 		if err != nil {
 			utils.AviLog.Warnf("GatewayClass not found %v", err)
-			return
+			return updatedObj, err
 		}
-		o.Patch(key, updatedObj, status, retry+1)
-		return
+		return o.Patch(key, updatedObj, status, retry+1)
 	}
-
 	utils.AviLog.Infof("key: %s, msg: Successfully updated the GatewayClass %s status %+v %v", key, gatewayClass.Name, utils.Stringify(status), err)
+	return updatedObject, nil
 }
 
 func (o *gatewayClass) isStatusEqual(old, new *gatewayv1.GatewayClassStatus) bool {

ako-gateway-api/status/httproute_status.go

@@ -17,6 +17,7 @@ package status
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"reflect"
 	"strings"
 
@@ -89,31 +90,31 @@ func (o *httproute) Patch(key string, obj runtime.Object, status *status.Status,
 		retry = retryNum[0]
 		if retry >= 5 {
 			utils.AviLog.Errorf("key: %s, msg: Patch retried 5 times, aborting", key)
-			return
+			return obj, errors.New("Patch retried 5 times, aborting")
 		}
 	}
 
 	httpRoute := obj.(*gatewayv1.HTTPRoute)
 	if o.isStatusEqual(&httpRoute.Status, status.HTTPRouteStatus) {
-		return
+		return obj, nil
 	}
 
 	patchPayload, _ := json.Marshal(map[string]interface{}{
 		"status": status.HTTPRouteStatus,
 	})
-	_, err := akogatewayapilib.AKOControlConfig().GatewayAPIClientset().GatewayV1().HTTPRoutes(httpRoute.Namespace).Patch(context.TODO(), httpRoute.Name, types.MergePatchType, patchPayload, metav1.PatchOptions{}, "status")
+	updatedObject, err := akogatewayapilib.AKOControlConfig().GatewayAPIClientset().GatewayV1().HTTPRoutes(httpRoute.Namespace).Patch(context.TODO(), httpRoute.Name, types.MergePatchType, patchPayload, metav1.PatchOptions{}, "status")
 	if err != nil {
 		utils.AviLog.Warnf("key: %s, msg: there was an error in updating the HTTPRoute status. err: %+v, retry: %d", key, err, retry)
 		updatedObj, err := akogatewayapilib.AKOControlConfig().GatewayApiInformers().HTTPRouteInformer.Lister().HTTPRoutes(httpRoute.Namespace).Get(httpRoute.Name)
 		if err != nil {
 			utils.AviLog.Warnf("HTTPRoute not found %v", err)
-			return
+			return updatedObj, err
 		}
-		o.Patch(key, updatedObj, status, retry+1)
-		return
+		return o.Patch(key, updatedObj, status, retry+1)
 	}
 
 	utils.AviLog.Infof("key: %s, msg: Successfully updated the HTTPRoute %s/%s status %+v", key, httpRoute.Namespace, httpRoute.Name, utils.Stringify(status))
+	return updatedObject, nil
 }
 
 func (o *httproute) isStatusEqual(old, new *gatewayv1.HTTPRouteStatus) bool {

ako-gateway-api/status/status.go

@@ -15,6 +15,9 @@
 package status
 
 import (
+	"errors"
+
+	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
 
@@ -98,7 +101,7 @@ func Record(key string, obj runtime.Object, objStatus *status.Status) {
 		key = serviceMetadata.HTTPRoute
 	default:
 		utils.AviLog.Warnf("key %s, msg: Unsupported object received at the status layer, %T", key, obj)
-		return
+		return obj, errors.New("Unsupported object received at the status layer")
 	}
 	updateOption.Status = objStatus
 	updateOption.ServiceMetadata = serviceMetadata

internal/lib/constants.go

@@ -222,6 +222,7 @@ const (
 	Synced                   = "Synced"
 	Attached                 = "Attached"
 	Detached                 = "Detached"
+	PatchFailed              = "PatchFailed"
 	InvalidConfiguration     = "InvalidConfiguration"
 	AKODeleteConfigSet       = "AKODeleteConfigSet"
 	AKODeleteConfigUnset     = "AKODeleteConfigUnset"

tests/gatewayapitests/graphlayer/gateway_test.go

@@ -427,19 +427,17 @@ func TestSecretCreateDelete(t *testing.T) {
 	g.Eventually(func() bool {
 		found, _ := objects.SharedAviGraphLister().Get(modelName)
 		return found
-	}, 30*time.Second).Should(gomega.Equal(true))
+	}, 30*time.Second).Should(gomega.Equal(false))
 
 	_, aviModel := objects.SharedAviGraphLister().Get(modelName)
-	nodes := aviModel.(*avinodes.AviObjectGraph).GetAviEvhVS()
-	g.Expect(nodes).To(gomega.HaveLen(1))
-	g.Expect(nodes[0].SSLKeyCertRefs).To(gomega.HaveLen(0))
+	g.Expect(aviModel).To(gomega.BeNil())
 
 	integrationtest.AddSecret(secrets[0], DEFAULT_NAMESPACE, "cert", "key")
 
 	g.Eventually(func() bool {
 		found, aviModel := objects.SharedAviGraphLister().Get(modelName)
 		if found {
-			nodes = aviModel.(*avinodes.AviObjectGraph).GetAviEvhVS()
+			nodes := aviModel.(*avinodes.AviObjectGraph).GetAviEvhVS()
 			g.Expect(nodes).To(gomega.HaveLen(1))
 			g.Expect(nodes[0].SSLKeyCertRefs).To(gomega.HaveLen(1))
 			return true
@@ -453,7 +451,7 @@ func TestSecretCreateDelete(t *testing.T) {
 	g.Eventually(func() bool {
 		found, aviModel := objects.SharedAviGraphLister().Get(modelName)
 		if found {
-			nodes = aviModel.(*avinodes.AviObjectGraph).GetAviEvhVS()
+			nodes := aviModel.(*avinodes.AviObjectGraph).GetAviEvhVS()
 			g.Expect(nodes).To(gomega.HaveLen(1))
 			g.Expect(nodes[0].SSLKeyCertRefs).To(gomega.HaveLen(0))
 			return true

tests/gatewayapitests/graphlayer/httproute_test.go

@@ -1256,6 +1256,7 @@ func TestHTTPRouteWithMultipleGateways(t *testing.T) {
 	integrationtest.DelSVC(t, DEFAULT_NAMESPACE, svcName)
 	integrationtest.DelEPorEPS(t, DEFAULT_NAMESPACE, svcName)
 	akogatewayapitests.TeardownGateway(t, gatewayName1, DEFAULT_NAMESPACE)
+	akogatewayapitests.TeardownGateway(t, gatewayName2, DEFAULT_NAMESPACE)
 	akogatewayapitests.TeardownGatewayClass(t, gatewayClassName)
 }