Merge pull request #1147 from CrowleyRajapakse/newmaster2

Fixing ratelimit policy update from admin portal issue
wso2 · Apr 8, 2024 · c1808df · c1808df
2 parents 39b2771 + 2a26775
commit c1808df
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/apim-apk-agent/internal/k8sClient/k8s_client.go b/apim-apk-agent/internal/k8sClient/k8s_client.go
@@ -306,6 +306,7 @@ func DeployRateLimitPolicyCR(rateLimitPolicies *dpv1alpha1.RateLimitPolicy, k8sC
 		}
 	} else {
 		crRateLimitPolicies.Spec = rateLimitPolicies.Spec
+		crRateLimitPolicies.ObjectMeta.Labels = rateLimitPolicies.ObjectMeta.Labels
 		if err := k8sClient.Update(context.Background(), crRateLimitPolicies); err != nil {
 			loggers.LoggerK8sClient.Error("Unable to update RateLimitPolicies CR: " + err.Error())
 		} else {

diff --git a/apim-apk-agent/pkg/transformer/transformer.go b/apim-apk-agent/pkg/transformer/transformer.go
@@ -857,10 +857,10 @@ func addRateLimitPolicyNames(k8sArtifact *K8sArtifacts, configuredRateLimitPolic
 	for _, rateLimitPolicy := range k8sArtifact.RateLimitPolicies {
 		if strings.Contains(rateLimitPolicy.Name, "api-") {
 			rateLimitPolicy.ObjectMeta.Labels[k8sRateLimitPolicyNameField] = generateSHA1Hash(configuredRateLimitPoliciesMap["API"].Name)
-			logger.LoggerTransformer.Infof("1 Rate Limit Policy Name: %v", rateLimitPolicy.ObjectMeta.Labels[k8sRateLimitPolicyNameField])
+			logger.LoggerTransformer.Infof("Rate Limit Policy Name: %v", rateLimitPolicy.ObjectMeta.Labels[k8sRateLimitPolicyNameField])
 		} else if strings.Contains(rateLimitPolicy.Name, "resource-") {
 			rateLimitPolicy.ObjectMeta.Labels[k8sRateLimitPolicyNameField] = generateSHA1Hash(configuredRateLimitPoliciesMap["Resource"].Name)
-			logger.LoggerTransformer.Infof("2 Rate Limit Policy Name: %v", rateLimitPolicy.ObjectMeta.Labels[k8sRateLimitPolicyNameField])
+			logger.LoggerTransformer.Infof("Rate Limit Policy Name: %v", rateLimitPolicy.ObjectMeta.Labels[k8sRateLimitPolicyNameField])
 		}
 	}
 }