Skip to content

Commit

Permalink
fix(meshgateway): do not override annotations from deployment, this c…
Browse files Browse the repository at this point in the history
…an cause problems with using kubernetes rollout restart

Signed-off-by: Marcin Skalski <skalskimarcin33@gmail.com>
  • Loading branch information
Automaat committed Jul 1, 2024
1 parent 9f68d20 commit d7de3a1
Showing 1 changed file with 6 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down

0 comments on commit d7de3a1

Please sign in to comment.