Merge pull request #1542 from Krishanx92/new-jwks

Remove targetref namespace from cc
wso2 · Jul 31, 2023 · 90d0cb9 · 90d0cb9
2 parents b825ef7 + 30dc90e
commit 90d0cb9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/common-controller/internal/operator/controller/ratelimitpolicy_controller.go b/common-controller/internal/operator/controller/ratelimitpolicy_controller.go
@@ -198,9 +198,8 @@ func (ratelimitReconsiler *RateLimitPolicyReconciler) AddRatelimitRequest(obj k8
 
 	return []reconcile.Request{{
 		NamespacedName: types.NamespacedName{
-			Name: string(ratelimitPolicy.Name),
-			Namespace: GetNamespace(
-				(*gwapiv1b1.Namespace)(ratelimitPolicy.Spec.TargetRef.Namespace), ratelimitPolicy.Namespace),
+			Name:      string(ratelimitPolicy.Name),
+			Namespace: ratelimitPolicy.Namespace,
 		},
 	}}
 }
@@ -414,10 +413,8 @@ func addIndexes(ctx context.Context, mgr manager.Manager) error {
 			var apis []string
 			apis = append(apis,
 				types.NamespacedName{
-					Namespace: GetNamespace(
-						(*gwapiv1b1.Namespace)(ratelimitPolicy.Spec.TargetRef.Namespace),
-						ratelimitPolicy.Namespace),
-					Name: string(ratelimitPolicy.Spec.TargetRef.Name),
+					Namespace: ratelimitPolicy.Namespace,
+					Name:      string(ratelimitPolicy.Spec.TargetRef.Name),
 				}.String())
 			return apis
 		})

diff --git a/helm-charts/templates/data-plane/ratelimiter/ratelimiter-deployment.yaml b/helm-charts/templates/data-plane/ratelimiter/ratelimiter-deployment.yaml
@@ -246,4 +246,4 @@ spec:
             secretName: {{ .Values.wso2.apk.dp.gatewayRuntime.tracing.configProperties.tls.secretName}}
             defaultMode: 420
         {{ end }}
-{{- end -}}
+{{- end -}}