fix(meshgateway): do not override annotations from deployment (#10698)

fix(meshgateway): do not override annotations from deployment, this can cause problems with using kubernetes rollout restart Signed-off-by: Marcin Skalski <skalskimarcin33@gmail.com>
kumahq · Oct 2, 2024 · 82a1815 · 82a1815
1 parent 1a45d75
commit 82a1815
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/pkg/plugins/runtime/k8s/controllers/gateway_instance_controller.go b/pkg/plugins/runtime/k8s/controllers/gateway_instance_controller.go
@@ -317,6 +317,12 @@ func (r *GatewayInstanceReconciler) createOrUpdateDeployment(
 				metadata.KumaMeshAnnotation:    mesh,
 			}
 
+			if obj != nil {
+				for k, v := range obj.(*kube_apps.Deployment).Spec.Template.GetAnnotations() {
+					podAnnotations[k] = v
+				}
+			}
+
 			for k, v := range gatewayInstance.Spec.PodTemplate.Metadata.Annotations {
 				podAnnotations[k] = v
 			}