From b4716599ae56f5220eddc6511d674b5da205b440 Mon Sep 17 00:00:00 2001 From: Matt Keeler Date: Mon, 5 Feb 2024 10:38:11 -0500 Subject: [PATCH] Disable the API GW v2 controller With the previous commit, this would cause a server to panic due to watching a type which has not yet been created/registered. --- internal/mesh/internal/controllers/register.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/internal/mesh/internal/controllers/register.go b/internal/mesh/internal/controllers/register.go index a543fd66d6..1729a51498 100644 --- a/internal/mesh/internal/controllers/register.go +++ b/internal/mesh/internal/controllers/register.go @@ -5,7 +5,6 @@ package controllers import ( "context" - "github.com/hashicorp/consul/internal/mesh/internal/controllers/apigateways" "github.com/hashicorp/consul/internal/mesh/internal/controllers/gatewayproxy" "github.com/hashicorp/consul/internal/mesh/internal/controllers/meshconfiguration" @@ -58,5 +57,8 @@ func Register(mgr *controller.Manager, deps Dependencies) { mgr.Register(meshgateways.Controller()) mgr.Register(meshconfiguration.Controller()) - mgr.Register(apigateways.Controller()) + + // This controller is currently configured to watch types which aren't registered and produces infinite + // errors because of this. Once the watched types are in place we should uncomment this. + // mgr.Register(apigateways.Controller()) }