OSSM-6295: Copy all annotations and labels added by ArgoCD except `ar…

…gocd.argoproj.io/instance` (#980) * OSSM-6295: Copy ArgoCD annotations from Gateway to Route Signed-off-by: Jacek Ewertowski <[email protected]> * OSSM-6295: Copy all annotations and labels added by ArgoCD except argocd.argoproj.io/instance Signed-off-by: Jacek Ewertowski <[email protected]> * Fix lint errors Signed-off-by: Jacek Ewertowski <[email protected]> --------- Co-authored-by: Jacek Ewertowski <[email protected]> Signed-off-by: Yann Liu <[email protected]>
maistra · May 28, 2024 · 89fa4fd · 89fa4fd
1 parent c5bdded
commit 89fa4fd
Show file tree

Hide file tree

Showing 2 changed files with 157 additions and 142 deletions.
diff --git a/pilot/pkg/config/kube/ior/controller.go b/pilot/pkg/config/kube/ior/controller.go
@@ -125,7 +125,6 @@ func filteredRouteAnnotation(routeAnnotation string) bool {
 	filteredPrefixes := [...]string{
 		ShouldManageRouteAnnotation,
 		"kubectl.kubernetes.io",
-		"argocd.argoproj.io",
 	}
 
 	for _, prefix := range filteredPrefixes {
@@ -139,7 +138,7 @@ func filteredRouteAnnotation(routeAnnotation string) bool {
 func filteredRouteLabel(routeLabel string) bool {
 	filteredPrefixes := [...]string{
 		maistraPrefix,
-		"argocd.argoproj.io",
+		"argocd.argoproj.io/instance",
 	}
 
 	for _, prefix := range filteredPrefixes {