operator: Gateway pods do not need to have INSTANCE_AVAILABILITY_ZONE…

… env set in their containers (#9950)
grafana · Jul 17, 2023 · 97d34ea · 97d34ea
1 parent 15af77b
commit 97d34ea
Showing 1 changed file with 6 additions and 4 deletions.
diff --git 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 {