Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

AV-214603 Changes for accepting Gateway with some valid and some invalid listener #1550

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

AV-214603 Changes for accepting Gateway with some valid and some invalid listener #1550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e16df96
AV-206839 Gateway status fixes
pkoshtavmware Sep 24, 2024
c43fed6
AV-214603 Moving HTTPRoute Validation to Graph layer
pkoshtavmware Sep 27, 2024
afba360
AV-206829 move gateway/route status updates to status layer
arihantg Oct 3, 2024
72a34ad
AV-214603 Changes for accepting Gateway with some valid and some inva…
pkoshtavmware Oct 4, 2024
118cf9f
Merge remote-tracking branch 'refs/remotes/origin/AV-214603-master' i…
pkoshtavmware Oct 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ako-gateway-api/k8s/ako_init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ func (c *GatewayController) FullSyncK8s(sync bool) error {
resVer := meta.GetResourceVersion()
objects.SharedResourceVerInstanceLister().Save(key, resVer)
}
if IsValidGateway(key, gatewayObj) {
if valid, _ := IsValidGateway(key, gatewayObj); valid {
filteredGateways = append(filteredGateways, gatewayObj)
}
}
Expand Down Expand Up @@ -304,7 +304,7 @@ func (c *GatewayController) FullSyncK8s(sync bool) error {
resVer := meta.GetResourceVersion()
objects.SharedResourceVerInstanceLister().Save(key, resVer)
}
if IsHTTPRouteValid(key, httpRouteObj) {
if IsHTTPRouteConfigValid(key, httpRouteObj) {
filteredHTTPRoutes = append(filteredHTTPRoutes, httpRouteObj)
}
}
Expand Down
62 changes: 58 additions & 4 deletions ako-gateway-api/k8s/gateway_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,14 @@ package k8s
import (
"fmt"
"reflect"
"sort"
"sync"
"time"

corev1 "k8s.io/api/core/v1"
discovery "k8s.io/api/discovery/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/client-go/tools/cache"
"k8s.io/client-go/util/workqueue"
Expand All @@ -30,6 +33,7 @@ import (
gatewayexternalversions "sigs.k8s.io/gateway-api/pkg/client/informers/externalversions"

akogatewayapilib "github.com/vmware/load-balancer-and-ingress-services-for-kubernetes/ako-gateway-api/lib"
akogatewayapiobjects "github.com/vmware/load-balancer-and-ingress-services-for-kubernetes/ako-gateway-api/objects"
"github.com/vmware/load-balancer-and-ingress-services-for-kubernetes/internal/k8s"
"github.com/vmware/load-balancer-and-ingress-services-for-kubernetes/internal/lib"
"github.com/vmware/load-balancer-and-ingress-services-for-kubernetes/internal/objects"
Expand Down Expand Up @@ -499,13 +503,23 @@ func (c *GatewayController) SetupGatewayApiEventHandlers(numWorkers uint32) {
utils.AviLog.Debugf("key: %s, msg: same resource version returning", key)
return
}
if !IsValidGateway(key, gw) {
valid, allowedRoutesAll := IsValidGateway(key, gw)
if !valid {
return
}
listRoutes, err := validateReferredHTTPRoute(key, allowedRoutesAll, *gw)
if err != nil {
utils.AviLog.Errorf("Validation of Referred HTTPRoutes Failed due to error : %s", err.Error())
}
namespace, _, _ := cache.SplitMetaNamespaceKey(utils.ObjKey(gw))
bkt := utils.Bkt(namespace, numWorkers)
c.workqueue[bkt].AddRateLimited(key)
utils.AviLog.Debugf("key: %s, msg: ADD", key)
for _, route := range listRoutes {
key := lib.HTTPRoute + "/" + utils.ObjKey(route)
c.workqueue[bkt].AddRateLimited(key)
utils.AviLog.Debugf("key: %s, msg: UPDATE", key)
}
},
DeleteFunc: func(obj interface{}) {
if c.DisableSync {
Expand All @@ -530,6 +544,7 @@ func (c *GatewayController) SetupGatewayApiEventHandlers(numWorkers uint32) {
namespace, _, _ := cache.SplitMetaNamespaceKey(utils.ObjKey(gw))
bkt := utils.Bkt(namespace, numWorkers)
c.workqueue[bkt].AddRateLimited(key)
akogatewayapiobjects.GatewayApiLister().DeleteGatewayToGatewayStatusMapping(utils.ObjKey(gw))
utils.AviLog.Debugf("key: %s, msg: DELETE", key)
},
UpdateFunc: func(old, obj interface{}) {
Expand All @@ -540,13 +555,23 @@ func (c *GatewayController) SetupGatewayApiEventHandlers(numWorkers uint32) {
gw := obj.(*gatewayv1.Gateway)
if IsGatewayUpdated(oldGw, gw) {
key := lib.Gateway + "/" + utils.ObjKey(gw)
if !IsValidGateway(key, gw) {
valid, allowedRoutesAll := IsValidGateway(key, gw)
if !valid {
return
}
listRoutes, err := validateReferredHTTPRoute(key, allowedRoutesAll, *gw)
if err != nil {
utils.AviLog.Errorf("Validation of Referred HTTPRoutes Failed due to error : %s", err.Error())
}
namespace, _, _ := cache.SplitMetaNamespaceKey(utils.ObjKey(gw))
bkt := utils.Bkt(namespace, numWorkers)
c.workqueue[bkt].AddRateLimited(key)
utils.AviLog.Debugf("key: %s, msg: UPDATE", key)
for _, route := range listRoutes {
key := lib.HTTPRoute + "/" + utils.ObjKey(route)
c.workqueue[bkt].AddRateLimited(key)
utils.AviLog.Debugf("key: %s, msg: UPDATE", key)
}
}
},
}
Expand Down Expand Up @@ -633,7 +658,7 @@ func (c *GatewayController) SetupGatewayApiEventHandlers(numWorkers uint32) {
utils.AviLog.Debugf("key: %s, msg: same resource version returning", key)
return
}
if !IsHTTPRouteValid(key, httpRoute) {
if !IsHTTPRouteConfigValid(key, httpRoute) {
return
}
namespace, _, _ := cache.SplitMetaNamespaceKey(utils.ObjKey(httpRoute))
Expand Down Expand Up @@ -674,7 +699,7 @@ func (c *GatewayController) SetupGatewayApiEventHandlers(numWorkers uint32) {
newHTTPRoute := obj.(*gatewayv1.HTTPRoute)
if IsHTTPRouteUpdated(oldHTTPRoute, newHTTPRoute) {
key := lib.HTTPRoute + "/" + utils.ObjKey(newHTTPRoute)
if !IsHTTPRouteValid(key, newHTTPRoute) {
if !IsHTTPRouteConfigValid(key, newHTTPRoute) {
return
}
namespace, _, _ := cache.SplitMetaNamespaceKey(utils.ObjKey(newHTTPRoute))
Expand Down Expand Up @@ -712,3 +737,32 @@ func validateAviConfigMap(obj interface{}) (*corev1.ConfigMap, bool) {
}
return nil, false
}
func validateReferredHTTPRoute(key string, allowedRoutesAll bool, gateway gatewayv1.Gateway) ([]*gatewayv1.HTTPRoute, error) {

namespace := gateway.Namespace
if allowedRoutesAll {
namespace = metav1.NamespaceAll
}
hrObjs, err := akogatewayapilib.AKOControlConfig().GatewayApiInformers().HTTPRouteInformer.Lister().HTTPRoutes(namespace).List(labels.Set(nil).AsSelector())
httpRoutes := make([]*gatewayv1.HTTPRoute, 0)
if err != nil {
return nil, err
}
for _, httpRoute := range hrObjs {
for _, parentRef := range httpRoute.Spec.ParentRefs {
if parentRef.Name == gatewayv1.ObjectName(gateway.Name) {
if IsHTTPRouteConfigValid(key, httpRoute) {
httpRoutes = append(httpRoutes, httpRoute)
}
break
}
}
}
sort.Slice(httpRoutes, func(i, j int) bool {
if httpRoutes[i].GetCreationTimestamp().Unix() == httpRoutes[j].GetCreationTimestamp().Unix() {
return httpRoutes[i].Namespace+"/"+httpRoutes[i].Name < httpRoutes[j].Namespace+"/"+httpRoutes[j].Name
}
return httpRoutes[i].GetCreationTimestamp().Unix() < httpRoutes[j].GetCreationTimestamp().Unix()
})
return httpRoutes, nil
}
Loading
Loading