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

[backport] gateway2: skip non-Gloo Gateways #10587

Merged
merged 2 commits into from
Jan 30, 2025
Merged

[backport] gateway2: skip non-Gloo Gateways #10587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9df1caf
gateway2: skip non-Gloo Gateways
shashankram Jan 30, 2025
8f81ae6
allow extra gwclasses
shashankram Jan 30, 2025
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
7 changes: 7 additions & 0 deletions changelog/v1.18.7/check-gw.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
changelog:
- type: FIX
issueLink: https://github.com/solo-io/solo-projects/issues/7768
resolvesIssue: false
description: |
Fixes a bug where we translate Gateways that do not belong to us.

27 changes: 16 additions & 11 deletions projects/gateway2/controller/start.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,12 @@ type StartConfig struct {
// It is intended to be run in a goroutine as the function will block until the supplied
// context is cancelled
type ControllerBuilder struct {
proxySyncer *proxy_syncer.ProxySyncer
inputChannels *proxy_syncer.GatewayInputChannels
cfg StartConfig
k8sGwExtensions ext.K8sGatewayExtensions
mgr ctrl.Manager
proxySyncer *proxy_syncer.ProxySyncer
inputChannels *proxy_syncer.GatewayInputChannels
cfg StartConfig
k8sGwExtensions ext.K8sGatewayExtensions
mgr ctrl.Manager
allowedGatewayClasses sets.Set[string]
}

func NewControllerBuilder(ctx context.Context, cfg StartConfig) (*ControllerBuilder, error) {
Expand Down Expand Up @@ -170,6 +171,8 @@ func NewControllerBuilder(ctx context.Context, cfg StartConfig) (*ControllerBuil
return nil, err
}

allowedGatewayClasses := sets.New(append(cfg.SetupOpts.ExtraGatewayClasses, wellknown.GatewayClassName)...)

// Create the proxy syncer for the Gateway API resources
setupLog.Info("initializing proxy syncer")
proxySyncer := proxy_syncer.NewProxySyncer(
Expand All @@ -190,6 +193,7 @@ func NewControllerBuilder(ctx context.Context, cfg StartConfig) (*ControllerBuil
cfg.SyncerExtensions,
cfg.GlooStatusReporter,
cfg.SetupOpts.ProxyReconcileQueue,
allowedGatewayClasses,
)
proxySyncer.Init(ctx, cfg.Debugger)
if err := mgr.Add(proxySyncer); err != nil {
Expand All @@ -198,11 +202,12 @@ func NewControllerBuilder(ctx context.Context, cfg StartConfig) (*ControllerBuil
}

return &ControllerBuilder{
proxySyncer: proxySyncer,
inputChannels: inputChannels,
cfg: cfg,
k8sGwExtensions: k8sGwExtensions,
mgr: mgr,
proxySyncer: proxySyncer,
inputChannels: inputChannels,
cfg: cfg,
k8sGwExtensions: k8sGwExtensions,
mgr: mgr,
allowedGatewayClasses: allowedGatewayClasses,
}, nil
}

Expand Down Expand Up @@ -246,7 +251,7 @@ func (c *ControllerBuilder) Start(ctx context.Context) error {

gwCfg := GatewayConfig{
Mgr: c.mgr,
GWClasses: sets.New(append(c.cfg.SetupOpts.ExtraGatewayClasses, wellknown.GatewayClassName)...),
GWClasses: c.allowedGatewayClasses,
ControllerName: wellknown.GatewayControllerName,
AutoProvision: AutoProvision,
ControlPlane: deployer.ControlPlaneInfo{
Expand Down
13 changes: 10 additions & 3 deletions projects/gateway2/proxy_syncer/proxy_syncer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"github.com/solo-io/gloo/projects/gloo/pkg/syncer/setup"
"github.com/solo-io/gloo/projects/gloo/pkg/xds"
rlkubev1a1 "github.com/solo-io/solo-apis/pkg/api/ratelimit.solo.io/v1alpha1"
"k8s.io/apimachinery/pkg/util/sets"

"github.com/solo-io/solo-kit/pkg/api/v1/clients/common"
"github.com/solo-io/solo-kit/pkg/api/v1/clients/kubesecret"
Expand Down Expand Up @@ -93,8 +94,9 @@ type ProxySyncer struct {
proxiesToReconcile krt.Singleton[proxyList]
proxyTrigger *krt.RecomputeTrigger

destRules DestinationRuleIndex
translator setup.TranslatorFactory
destRules DestinationRuleIndex
translator setup.TranslatorFactory
allowedGatewayClasses sets.Set[string]

waitForSync []cache.InformerSynced
}
Expand Down Expand Up @@ -133,6 +135,7 @@ func NewProxySyncer(
syncerExtensions []syncer.TranslatorSyncerExtension,
glooReporter reporter.StatusReporter,
proxyReconcileQueue ggv2utils.AsyncQueue[gloov1.ProxyList],
allowedGatewayClasses sets.Set[string],
) *ProxySyncer {
return &ProxySyncer{
initialSettings: initialSettings,
Expand All @@ -154,7 +157,8 @@ func NewProxySyncer(
// once we audit the plugins to be safe for concurrent use, we can instantiate the translator here.
// this will also have the advantage, that the plugin life-cycle will outlive a single translation
// so that they could own krt collections internally.
translator: translator,
translator: translator,
allowedGatewayClasses: allowedGatewayClasses,
}
}

Expand Down Expand Up @@ -409,6 +413,9 @@ func (s *ProxySyncer) Init(ctx context.Context, dbg *krt.DebugHandler) error {
s.proxyTrigger = krt.NewRecomputeTrigger(true)

glooProxies := krt.NewCollection(kubeGateways, func(kctx krt.HandlerContext, gw *gwv1.Gateway) *glooProxy {
if !s.allowedGatewayClasses.Has(string(gw.Spec.GatewayClassName)) {
return nil
}
logger.Debugf("building proxy for kube gw %s version %s", client.ObjectKeyFromObject(gw), gw.GetResourceVersion())
s.proxyTrigger.MarkDependant(kctx)
proxy := s.buildProxy(ctx, gw)
Expand Down