From 97d34ea5af8ecfe4b77a8b62ca0e31f182102376 Mon Sep 17 00:00:00 2001
From: Shweta Padubidri <spadubid@redhat.com>
Date: Mon, 17 Jul 2023 03:26:24 -0400
Subject: [PATCH] operator: Gateway pods do not need to have
 INSTANCE_AVAILABILITY_ZONE env set in their containers (#9950)

---
 operator/internal/manifests/node_placement.go | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/operator/internal/manifests/node_placement.go b/operator/internal/manifests/node_placement.go
index cefd6375f13b1..50e9c335b3653 100644
--- a/operator/internal/manifests/node_placement.go
+++ b/operator/internal/manifests/node_placement.go
@@ -63,11 +63,13 @@ func configureReplication(podTemplate *corev1.PodTemplateSpec, replication *loki
 		Env: []corev1.EnvVar{availabilityZoneEnvVar},
 	}
 
-	for i, dst := range podTemplate.Spec.Containers {
-		if err := mergo.Merge(&dst, src, mergo.WithAppendSlice); err != nil {
-			return err
+	if component != LabelGatewayComponent {
+		for i, dst := range podTemplate.Spec.Containers {
+			if err := mergo.Merge(&dst, src, mergo.WithAppendSlice); err != nil {
+				return err
+			}
+			podTemplate.Spec.Containers[i] = dst
 		}
-		podTemplate.Spec.Containers[i] = dst
 	}
 
 	if err := mergo.Merge(podTemplate, template); err != nil {