Skip to content

Commit

Permalink
fix(meshgateway): do not override annotations from deployment (backpo…
Browse files Browse the repository at this point in the history
…rt of #10698) (#11617)

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>
Co-authored-by: Marcin Skalski <marcin.skalski@konghq.com>
  • Loading branch information
kumahq[bot] and Automaat authored Oct 2, 2024
1 parent 9ddaad1 commit e8dfe5f
Showing 1 changed file with 6 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,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
}
Expand Down

0 comments on commit e8dfe5f

Please sign in to comment.