From 9908d920adadafe9d95782f6e50919f97d386b53 Mon Sep 17 00:00:00 2001
From: Luke Kysow <1034429+lkysow@users.noreply.github.com>
Date: Mon, 8 Nov 2021 11:12:02 -0800
Subject: [PATCH] Re-enable streaming for clients

---
 charts/consul/templates/client-config-configmap.yaml      | 3 +--
 charts/consul/templates/create-federation-secret-job.yaml | 6 ++----
 charts/consul/test/unit/client-daemonset.bats             | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/charts/consul/templates/client-config-configmap.yaml b/charts/consul/templates/client-config-configmap.yaml
index 4ba0785576..5954c1f86f 100644
--- a/charts/consul/templates/client-config-configmap.yaml
+++ b/charts/consul/templates/client-config-configmap.yaml
@@ -25,8 +25,7 @@ data:
        in the UI. */}}
   config.json: |-
     {
-      "check_update_interval": "0s",
-      "use_streaming_backend": false
+      "check_update_interval": "0s"
     }
   {{- end }}
 {{- end }}
diff --git a/charts/consul/templates/create-federation-secret-job.yaml b/charts/consul/templates/create-federation-secret-job.yaml
index e3f0818a24..096135dd2a 100644
--- a/charts/consul/templates/create-federation-secret-job.yaml
+++ b/charts/consul/templates/create-federation-secret-job.yaml
@@ -114,8 +114,7 @@ spec:
               mountPath: /consul/tls/client/ca
               readOnly: true
             {{- end }}
-            {{- if (or .Values.global.gossipEncryption.autoGenerate 
-                       (and .Values.global.gossipEncryption.secretName .Values.global.gossipEncryption.secretKey)) }}
+            {{- if (or .Values.global.gossipEncryption.autoGenerate (and .Values.global.gossipEncryption.secretName .Values.global.gossipEncryption.secretKey)) }}
             - name: gossip-encryption-key
               mountPath: /consul/gossip
               readOnly: true
@@ -127,8 +126,7 @@ spec:
                 consul-k8s-control-plane create-federation-secret \
                   -log-level={{ .Values.global.logLevel }} \
                   -log-json={{ .Values.global.logJSON }} \
-                  {{- if (or .Values.global.gossipEncryption.autoGenerate (and
-                             .Values.global.gossipEncryption.secretName .Values.global.gossipEncryption.secretKey)) }}
+                  {{- if (or .Values.global.gossipEncryption.autoGenerate (and .Values.global.gossipEncryption.secretName .Values.global.gossipEncryption.secretKey)) }}
                   -gossip-key-file=/consul/gossip/gossip.key \
                   {{- end }}
                   {{- if .Values.global.acls.createReplicationToken }}
diff --git a/charts/consul/test/unit/client-daemonset.bats b/charts/consul/test/unit/client-daemonset.bats
index 2d03f2f3aa..62c27a0106 100755
--- a/charts/consul/test/unit/client-daemonset.bats
+++ b/charts/consul/test/unit/client-daemonset.bats
@@ -569,7 +569,7 @@ load _helpers
       --set 'connectInject.enabled=true' \
       . | tee /dev/stderr |
       yq -r '.spec.template.metadata.annotations."consul.hashicorp.com/config-checksum"' | tee /dev/stderr)
-  [ "${actual}" = 1b0252854bdef3197902ee928716ebd691ef39b173a19ad0d4e883ddb0443b88 ]
+  [ "${actual}" = b0be8c9b3ae8692a4e393b93976c55988e95cb9d9dae96fbd8626f3f5b6c404b ]
 }
 
 #--------------------------------------------------------------------