Merge 768ea38 into backport/mg-fix-logic-on-apigateway-that-ignores-c…

…urrent-annotations-on-services/scarcely-fair-sole
hashicorp · Feb 13, 2024 · 443e71d · 443e71d
2 parents cc3cfb6 + 768ea38
commit 443e71d
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/control-plane/api-gateway/gatekeeper/service.go b/control-plane/api-gateway/gatekeeper/service.go
@@ -147,8 +147,6 @@ func mergeServiceInto(existing, desired *corev1.Service) {
 			existing.ObjectMeta.Labels[k] = v
 		}
 	}
-
-	return
 }
 
 // hasEqualPorts does a fuzzy comparison of the ports on a service spec