From e3f0f2117611fed03e271696b36e43654b210cf0 Mon Sep 17 00:00:00 2001
From: Ashwin Venkatesh <ashwin.what@gmail.com>
Date: Tue, 25 Jul 2023 15:44:29 +0000
Subject: [PATCH] backport of commit f1c9642003980f43a50b7ded48117b56ad964b2a

---
 .changelog/2652.txt                           |  3 +++
 charts/consul/templates/client-daemonset.yaml |  4 ----
 charts/consul/test/unit/client-daemonset.bats | 23 -------------------
 3 files changed, 3 insertions(+), 27 deletions(-)
 create mode 100644 .changelog/2652.txt

diff --git a/.changelog/2652.txt b/.changelog/2652.txt
new file mode 100644
index 0000000000..efa290c0e7
--- /dev/null
+++ b/.changelog/2652.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+helm: fix CONSUL_LOGIN_DATACENTER for consul client-daemonset.
+```
\ No newline at end of file
diff --git a/charts/consul/templates/client-daemonset.yaml b/charts/consul/templates/client-daemonset.yaml
index 09a70b394e..345c5c731e 100644
--- a/charts/consul/templates/client-daemonset.yaml
+++ b/charts/consul/templates/client-daemonset.yaml
@@ -510,11 +510,7 @@ spec:
           value: "component=client,pod=$(NAMESPACE)/$(POD_NAME)"
         {{- end }}
         - name: CONSUL_LOGIN_DATACENTER
-        {{- if and .Values.global.federation.enabled .Values.global.federation.primaryDatacenter }}
-          value: {{ .Values.global.federation.primaryDatacenter }}
-        {{- else }}
           value: {{ .Values.global.datacenter }}
-        {{- end}}
         command:
           - "/bin/sh"
           - "-ec"
diff --git a/charts/consul/test/unit/client-daemonset.bats b/charts/consul/test/unit/client-daemonset.bats
index 4c38207635..6e7a030cb1 100755
--- a/charts/consul/test/unit/client-daemonset.bats
+++ b/charts/consul/test/unit/client-daemonset.bats
@@ -2127,29 +2127,6 @@ rollingUpdate:
   [[ "$output" =~ "If global.federation.enabled is true, global.adminPartitions.enabled must be false because they are mutually exclusive" ]]
 }
 
-@test "client/DaemonSet: consul login datacenter is set to primary when when federation enabled in non-primary datacenter" {
-  cd `chart_dir`
-  local object=$(helm template \
-      -s templates/client-daemonset.yaml  \
-      --set 'client.enabled=true' \
-      --set 'meshGateway.enabled=true' \
-      --set 'global.acls.manageSystemACLs=true' \
-      --set 'global.datacenter=dc1' \
-      --set 'global.federation.enabled=true' \
-      --set 'global.federation.primaryDatacenter=dc2' \
-      --set 'global.tls.enabled=true' \
-      . | tee /dev/stderr |
-      yq '.spec.template.spec.initContainers[] | select(.name == "client-acl-init")' | tee /dev/stderr)
-
-  local actual=$(echo $object |
-      yq '[.env[11].name] | any(contains("CONSUL_LOGIN_DATACENTER"))' | tee /dev/stderr)
-  [ "${actual}" = "true" ]
-
-  local actual=$(echo $object |
-      yq '[.env[11].value] | any(contains("dc2"))' | tee /dev/stderr)
-  [ "${actual}" = "true" ]
-}
-
 #--------------------------------------------------------------------
 # extraContainers