From eb00d4781fc90ea24383967798b42874b33ba2f2 Mon Sep 17 00:00:00 2001
From: Luke Kysow <1034429+lkysow@users.noreply.github.com>
Date: Thu, 18 Feb 2021 10:43:48 -0800
Subject: [PATCH] Increase client init resources 25Mi => 50Mi (#832)

Increase the memory for the client daemonset's tls-init
container. We saw an out of memory error when running on OpenShift.
---
 CHANGELOG.md                    | 10 ++++++++++
 templates/client-daemonset.yaml |  4 ++--
 values.yaml                     |  2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 91a4103c6bf7..d4d72d0784cf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
 ## Unreleased
 
+BREAKING CHANGES:
+
+FEATURES:
+
+IMPROVEMENTS:
+
+BUG FIXES:
+* Increase Consul client daemonset's memory from `25Mi` to `50Mi` for its `client-tls-init`
+  init container that runs when TLS is enabled and auto-encrypt is disabled. [[GH-832](https://github.com/hashicorp/consul-helm/pull/832)]
+
 ## 0.30.0 (Feb 16, 2021)
 
 BREAKING CHANGES:
diff --git a/templates/client-daemonset.yaml b/templates/client-daemonset.yaml
index f2dd59c6e81e..209f8a1b4244 100644
--- a/templates/client-daemonset.yaml
+++ b/templates/client-daemonset.yaml
@@ -381,10 +381,10 @@ spec:
             readOnly: true
         resources:
           requests:
-            memory: "25Mi"
+            memory: "50Mi"
             cpu: "50m"
           limits:
-            memory: "25Mi"
+            memory: "50Mi"
             cpu: "50m"
       {{- end }}
       {{- end }}
diff --git a/values.yaml b/values.yaml
index c90eb31d8fe7..8b7d4186c1d3 100644
--- a/values.yaml
+++ b/values.yaml
@@ -314,7 +314,7 @@ server:
     # enable `server.exposeGossipAndRPCPorts` and `client.exposeGossipPorts`,
     # that will configure the LAN gossip ports on the servers and clients to be
     # hostPorts, so if you are running clients and servers on the same node the
-    # ports will conflict if they are both 8301.  When you enable
+    # ports will conflict if they are both 8301. When you enable
     # `server.exposeGossipAndRPCPorts` and `client.exposeGossipPorts`, you must
     # change this from the default to an unused port on the host, e.g. 9301. By
     # default the LAN gossip port is 8301 and configured as a containerPort on