Merge pull request #1225 from Tharsanan1/airl

Change the order of applying CRs
wso2 · Oct 19, 2024 · 21e898e · 21e898e
2 parents 540a18c + d66a51f
commit 21e898e
Showing 1 changed file with 18 additions and 17 deletions.
diff --git a/apim-apk-agent/internal/mapper/cr_mapper.go b/apim-apk-agent/internal/mapper/cr_mapper.go
@@ -39,23 +39,7 @@ func MapAndCreateCR(k8sArtifact transformer.K8sArtifacts, k8sClient client.Clien
 		return &err
 	}
 	k8sArtifact.API.Namespace = namespace
-	internalk8sClient.DeployAPICR(&k8sArtifact.API, k8sClient)
-	for _, apiPolicies := range k8sArtifact.APIPolicies {
-		apiPolicies.Namespace = namespace
-		internalk8sClient.DeployAPIPolicyCR(apiPolicies, k8sClient)
-	}
-	for _, httpRoutes := range k8sArtifact.HTTPRoutes {
-		httpRoutes.Namespace = namespace
-		internalk8sClient.DeployHTTPRouteCR(httpRoutes, k8sClient)
-	}
-	for _, gqlRoutes := range k8sArtifact.GQLRoutes {
-		gqlRoutes.Namespace = namespace
-		internalk8sClient.DeployGQLRouteCR(gqlRoutes, k8sClient)
-	}
-	for _, backends := range k8sArtifact.Backends {
-		backends.Namespace = namespace
-		internalk8sClient.DeployBackendCR(backends, k8sClient)
-	}
+
 	for _, configMaps := range k8sArtifact.ConfigMaps {
 		configMaps.Namespace = namespace
 		internalk8sClient.DeployConfigMapCR(configMaps, k8sClient)
@@ -88,6 +72,23 @@ func MapAndCreateCR(k8sArtifact transformer.K8sArtifacts, k8sClient client.Clien
 		secrets.Namespace = namespace
 		internalk8sClient.DeploySecretCR(secrets, k8sClient)
 	}
+	for _, apiPolicies := range k8sArtifact.APIPolicies {
+		apiPolicies.Namespace = namespace
+		internalk8sClient.DeployAPIPolicyCR(apiPolicies, k8sClient)
+	}
+	for _, httpRoutes := range k8sArtifact.HTTPRoutes {
+		httpRoutes.Namespace = namespace
+		internalk8sClient.DeployHTTPRouteCR(httpRoutes, k8sClient)
+	}
+	for _, gqlRoutes := range k8sArtifact.GQLRoutes {
+		gqlRoutes.Namespace = namespace
+		internalk8sClient.DeployGQLRouteCR(gqlRoutes, k8sClient)
+	}
+	for _, backends := range k8sArtifact.Backends {
+		backends.Namespace = namespace
+		internalk8sClient.DeployBackendCR(backends, k8sClient)
+	}
+	internalk8sClient.DeployAPICR(&k8sArtifact.API, k8sClient)
 	return nil
 }
 func getDeploymentNamespace(k8sArtifact transformer.K8sArtifacts) (string, error) {