[rlc] Using common.LimitadorName instead of removed rlptools

Kuadrant · Nov 29, 2022 · 4d451fc · 4d451fc
1 parent d7f074b
commit 4d451fc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/controllers/ratelimitpolicy_cluster_envoy_filter.go b/controllers/ratelimitpolicy_cluster_envoy_filter.go
@@ -17,7 +17,6 @@ import (
 	kuadrantv1beta1 "github.com/kuadrant/kuadrant-operator/api/v1beta1"
 	"github.com/kuadrant/kuadrant-operator/pkg/common"
 	kuadrantistioutils "github.com/kuadrant/kuadrant-operator/pkg/istio"
-	"github.com/kuadrant/kuadrant-operator/pkg/rlptools"
 )
 
 func (r *RateLimitPolicyReconciler) reconcileRateLimitingClusterEnvoyFilter(ctx context.Context, rlp *kuadrantv1beta1.RateLimitPolicy, gwDiffObj *gatewayDiff) error {
@@ -99,7 +98,7 @@ func (r *RateLimitPolicyReconciler) gatewayRateLimitingClusterEnvoyFilter(
 		return ef, nil
 	}
 
-	limitadorKey := client.ObjectKey{Name: rlptools.LimitadorName, Namespace: kuadrantNamespace}
+	limitadorKey := client.ObjectKey{Name: common.LimitadorName, Namespace: kuadrantNamespace}
 
 	limitador := &limitadorv1alpha1.Limitador{}
 	err = r.Client().Get(ctx, limitadorKey, limitador)

diff --git a/controllers/ratelimitpolicy_controller_test.go b/controllers/ratelimitpolicy_controller_test.go
@@ -160,7 +160,7 @@ var _ = Describe("RateLimitPolicy controller", func() {
 			// Check Limitador Status is Ready
 			Eventually(func() bool {
 				limitador := &limitadorv1alpha1.Limitador{}
-				err := k8sClient.Get(context.Background(), client.ObjectKey{Name: rlptools.LimitadorName, Namespace: testNamespace}, limitador)
+				err := k8sClient.Get(context.Background(), client.ObjectKey{Name: common.LimitadorName, Namespace: testNamespace}, limitador)
 				if err != nil {
 					return false
 				}
@@ -211,7 +211,7 @@ var _ = Describe("RateLimitPolicy controller", func() {
 				common.RateLimitPolicyBackRefAnnotation, client.ObjectKeyFromObject(rlp).String()))
 
 			// check limits
-			limitadorKey := client.ObjectKey{Name: rlptools.LimitadorName, Namespace: testNamespace}
+			limitadorKey := client.ObjectKey{Name: common.LimitadorName, Namespace: testNamespace}
 			existingLimitador := &limitadorv1alpha1.Limitador{}
 			err = k8sClient.Get(context.Background(), limitadorKey, existingLimitador)
 			// must exist

diff --git a/controllers/ratelimitpolicy_limits.go b/controllers/ratelimitpolicy_limits.go
@@ -22,7 +22,7 @@ func (r *RateLimitPolicyReconciler) reconcileLimits(ctx context.Context, rlp *ku
 		return err
 	}
 
-	limitadorKey := client.ObjectKey{Name: rlptools.LimitadorName, Namespace: kuadrantNamespace}
+	limitadorKey := client.ObjectKey{Name: common.LimitadorName, Namespace: kuadrantNamespace}
 	limitador := &limitadorv1alpha1.Limitador{}
 	err = r.Client().Get(ctx, limitadorKey, limitador)
 	logger.V(1).Info("reconcileLimits", "get limitador", limitadorKey, "err", err)