operator: remove unused internal gateway api model

This commit removes the unused and empty model within the gateway controller. Signed-off-by: Marco Hofstetter <marco.hofstetter@isovalent.com>
cilium · Dec 27, 2023 · 098d628 · 098d628
1 parent 0f68ad4
commit 098d628
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 31 deletions.
diff --git a/operator/pkg/gateway-api/controller.go b/operator/pkg/gateway-api/controller.go
@@ -37,9 +37,7 @@ const (
 	gatewayIndex        = "gatewayIndex"
 )
 
-var (
-	scheme = runtime.NewScheme()
-)
+var scheme = runtime.NewScheme()
 
 func init() {
 	utilruntime.Must(gatewayv1.AddToScheme(scheme))
@@ -49,15 +47,8 @@ func init() {
 	utilruntime.Must(ciliumv2.AddToScheme(scheme))
 }
 
-type internalModel struct {
-	// TODO(tam): I am not sure if we need to cache anything for performance gain,
-	// the client is reading from cache already.
-}
-
 type Controller struct {
 	mgr ctrl.Manager
-
-	model *internalModel
 }
 
 // NewController returns a new gateway controller, which is implemented
@@ -75,12 +66,9 @@ func NewController(enableSecretSync bool, secretsNamespace string, idleTimeoutSe
 		return nil, err
 	}
 
-	m := new(internalModel)
-
 	gwcReconciler := &gatewayClassReconciler{
 		Client:         mgr.GetClient(),
 		Scheme:         mgr.GetScheme(),
-		Model:          m,
 		controllerName: controllerName,
 	}
 	if err = gwcReconciler.SetupWithManager(mgr); err != nil {
@@ -91,7 +79,6 @@ func NewController(enableSecretSync bool, secretsNamespace string, idleTimeoutSe
 		Client:             mgr.GetClient(),
 		Scheme:             mgr.GetScheme(),
 		SecretsNamespace:   secretsNamespace,
-		Model:              m,
 		controllerName:     controllerName,
 		IdleTimeoutSeconds: idleTimeoutSeconds,
 	}
@@ -102,7 +89,6 @@ func NewController(enableSecretSync bool, secretsNamespace string, idleTimeoutSe
 	hrReconciler := &httpRouteReconciler{
 		Client: mgr.GetClient(),
 		Scheme: mgr.GetScheme(),
-		Model:  m,
 	}
 	if err = hrReconciler.SetupWithManager(mgr); err != nil {
 		return nil, err
@@ -111,7 +97,6 @@ func NewController(enableSecretSync bool, secretsNamespace string, idleTimeoutSe
 	grReconciler := &grpcRouteReconciler{
 		Client: mgr.GetClient(),
 		Scheme: mgr.GetScheme(),
-		Model:  m,
 	}
 	if err = grReconciler.SetupWithManager(mgr); err != nil {
 		return nil, err
@@ -120,7 +105,6 @@ func NewController(enableSecretSync bool, secretsNamespace string, idleTimeoutSe
 	tlsReconciler := &tlsRouteReconciler{
 		Client: mgr.GetClient(),
 		Scheme: mgr.GetScheme(),
-		Model:  m,
 	}
 	if err = tlsReconciler.SetupWithManager(mgr); err != nil {
 		return nil, err
@@ -129,7 +113,6 @@ func NewController(enableSecretSync bool, secretsNamespace string, idleTimeoutSe
 	rgReconciler := &referenceGrantReconciler{
 		Client: mgr.GetClient(),
 		Scheme: mgr.GetScheme(),
-		Model:  m,
 	}
 	if err = rgReconciler.SetupWithManager(mgr); err != nil {
 		return nil, err
@@ -148,8 +131,7 @@ func NewController(enableSecretSync bool, secretsNamespace string, idleTimeoutSe
 	}
 
 	return &Controller{
-		mgr:   mgr,
-		model: m,
+		mgr: mgr,
 	}, nil
 }
 

diff --git a/operator/pkg/gateway-api/gateway.go b/operator/pkg/gateway-api/gateway.go
@@ -40,7 +40,6 @@ type gatewayReconciler struct {
 	IdleTimeoutSeconds int
 
 	controllerName string
-	Model          *internalModel
 }
 
 // SetupWithManager sets up the controller with the Manager.

diff --git a/operator/pkg/gateway-api/gatewayclass.go b/operator/pkg/gateway-api/gatewayclass.go
@@ -17,8 +17,6 @@ type gatewayClassReconciler struct {
 	client.Client
 	Scheme *runtime.Scheme
 
-	Model *internalModel
-
 	controllerName string
 }
 

diff --git a/operator/pkg/gateway-api/grpcroute.go b/operator/pkg/gateway-api/grpcroute.go
@@ -28,8 +28,6 @@ import (
 type grpcRouteReconciler struct {
 	client.Client
 	Scheme *runtime.Scheme
-
-	Model *internalModel
 }
 
 // SetupWithManager sets up the controller with the Manager.

diff --git a/operator/pkg/gateway-api/httproute.go b/operator/pkg/gateway-api/httproute.go
@@ -28,8 +28,6 @@ import (
 type httpRouteReconciler struct {
 	client.Client
 	Scheme *runtime.Scheme
-
-	Model *internalModel
 }
 
 // SetupWithManager sets up the controller with the Manager.

diff --git a/operator/pkg/gateway-api/referencegrant.go b/operator/pkg/gateway-api/referencegrant.go
@@ -14,8 +14,6 @@ import (
 type referenceGrantReconciler struct {
 	client.Client
 	Scheme *runtime.Scheme
-
-	Model *internalModel
 }
 
 // SetupWithManager sets up the controller with the Manager.

diff --git a/operator/pkg/gateway-api/tlsroute.go b/operator/pkg/gateway-api/tlsroute.go
@@ -28,8 +28,6 @@ import (
 type tlsRouteReconciler struct {
 	client.Client
 	Scheme *runtime.Scheme
-
-	Model *internalModel
 }
 
 // SetupWithManager sets up the controller with the Manager.