Update resource setting config values

Init container resource settings are now split into each individual section. Lifecycle sidecar settings remain a global setting.
hashicorp · Jul 29, 2020 · 39698a4 · 39698a4
1 parent fe0ed93
commit 39698a4
Show file tree

Hide file tree

Showing 9 changed files with 589 additions and 79 deletions.
diff --git a/templates/connect-inject-deployment.yaml b/templates/connect-inject-deployment.yaml
@@ -138,31 +138,37 @@ spec:
                 {{- if not (kindIs "invalid" $resources.requests.cpu) }}
                 -default-sidecar-proxy-cpu-request={{ $resources.requests.cpu }} \
                 {{- end }}
-                {{- $resources := .Values.global.initContainer.resources }}
-                {{- if not (kindIs "invalid" $resources.limits.memory) }}
-                -init-container-memory-limit={{ $resources.limits.memory }} \
+
+                {{- if .Values.connectInject.initContainer }}
+                {{- $initResources := .Values.connectInject.initContainer.resources }}
+                {{- if not (kindIs "invalid" $initResources.limits.memory) }}
+                -init-container-memory-limit={{ $initResources.limits.memory }} \
                 {{- end }}
-                {{- if not (kindIs "invalid" $resources.requests.memory) }}
-                -init-container-memory-request={{ $resources.requests.memory }} \
+                {{- if not (kindIs "invalid" $initResources.requests.memory) }}
+                -init-container-memory-request={{ $initResources.requests.memory }} \
                 {{- end }}
-                {{- if not (kindIs "invalid" $resources.limits.cpu) }}
-                -init-container-cpu-limit={{ $resources.limits.cpu }} \
+                {{- if not (kindIs "invalid" $initResources.limits.cpu) }}
+                -init-container-cpu-limit={{ $initResources.limits.cpu }} \
                 {{- end }}
-                {{- if not (kindIs "invalid" $resources.requests.cpu) }}
-                -init-container-cpu-request={{ $resources.requests.cpu }} \
+                {{- if not (kindIs "invalid" $initResources.requests.cpu) }}
+                -init-container-cpu-request={{ $initResources.requests.cpu }} \
                 {{- end }}
-                {{- $resources := .Values.global.lifecycleSidecarContainer.resources }}
-                {{- if not (kindIs "invalid" $resources.limits.memory) }}
-                -lifecycle-sidecar-memory-limit={{ $resources.limits.memory }} \
                 {{- end }}
-                {{- if not (kindIs "invalid" $resources.requests.memory) }}
-                -lifecycle-sidecar-memory-request={{ $resources.requests.memory }} \
+
+                {{- if .Values.global.lifecycleSidecarContainer }}
+                {{- $lifecycleResources := .Values.global.lifecycleSidecarContainer.resources }}
+                {{- if not (kindIs "invalid" $lifecycleResources.limits.memory) }}
+                -lifecycle-sidecar-memory-limit={{ $lifecycleResources.limits.memory }} \
                 {{- end }}
-                {{- if not (kindIs "invalid" $resources.limits.cpu) }}
-                -lifecycle-sidecar-cpu-limit={{ $resources.limits.cpu }} \
+                {{- if not (kindIs "invalid" $lifecycleResources.requests.memory) }}
+                -lifecycle-sidecar-memory-request={{ $lifecycleResources.requests.memory }} \
+                {{- end }}
+                {{- if not (kindIs "invalid" $lifecycleResources.limits.cpu) }}
+                -lifecycle-sidecar-cpu-limit={{ $lifecycleResources.limits.cpu }} \
+                {{- end }}
+                {{- if not (kindIs "invalid" $lifecycleResources.requests.cpu) }}
+                -lifecycle-sidecar-cpu-request={{ $lifecycleResources.requests.cpu }} \
                 {{- end }}
-                {{- if not (kindIs "invalid" $resources.requests.cpu) }}
-                -lifecycle-sidecar-cpu-request={{ $resources.requests.cpu }} \
                 {{- end }}
           livenessProbe:
             httpGet:

diff --git a/templates/ingress-gateways-deployment.yaml b/templates/ingress-gateways-deployment.yaml
@@ -110,7 +110,12 @@ spec:
           volumeMounts:
           - name: consul-bin
             mountPath: /consul-bin
-          resources: {{ toYaml $root.Values.global.initContainer.resources | nindent 12 }}
+          {{- $initContainer := .initCopyConsulContainer }}
+          {{- if (or $initContainer $defaults.initCopyConsulContainer) }}
+          {{- if (default $defaults.initCopyConsulContainer.resources $initContainer.resources) }}
+          resources: {{ toYaml (default $defaults.initCopyConsulContainer.resources $initContainer.resources) | nindent 12 }}
+          {{- end }}
+          {{- end }}
         {{- if (and $root.Values.global.tls.enabled $root.Values.global.tls.enableAutoEncrypt) }}
         {{- include "consul.getAutoEncryptClientCA" $root | nindent 8 }}
         {{- end }}
@@ -257,6 +262,13 @@ spec:
               mountPath: /consul/tls/ca
               readOnly: true
             {{- end }}
+          resources:
+            requests:
+              memory: "25Mi"
+              cpu: "50m"
+            limits:
+              memory: "25Mi"
+              cpu: "50m"
       containers:
         - name: ingress-gateway
           image: {{ $root.Values.global.imageEnvoy | quote }}
@@ -373,7 +385,11 @@ spec:
               mountPath: /consul/tls/ca
               readOnly: true
             {{- end }}
+          {{- if  $root.Values.global.lifecycleSidecarContainer }}
+          {{- if $root.Values.global.lifecycleSidecarContainer.resources }}
           resources: {{ toYaml $root.Values.global.lifecycleSidecarContainer.resources | nindent 12 }}
+          {{- end }}
+          {{- end }}
           env:
             - name: HOST_IP
               valueFrom:

diff --git a/templates/mesh-gateway-deployment.yaml b/templates/mesh-gateway-deployment.yaml
@@ -90,7 +90,11 @@ spec:
           volumeMounts:
           - name: consul-bin
             mountPath: /consul-bin
-          resources: {{ toYaml .Values.global.initContainer.resources | nindent 12 }}
+          {{- if .Values.meshGateway.initCopyConsulContainer }}
+          {{- if .Values.meshGateway.initCopyConsulContainer.resources }}
+          resources: {{ toYaml .Values.meshGateway.initCopyConsulContainer.resources | nindent 12 }}
+          {{- end }}
+          {{- end }}
         {{- if (and .Values.global.tls.enabled .Values.global.tls.enableAutoEncrypt) }}
         {{- include "consul.getAutoEncryptClientCA" . | nindent 8 }}
         {{- end }}
@@ -324,7 +328,11 @@ spec:
               mountPath: /consul/tls/ca
               readOnly: true
             {{- end }}
+          {{- if .Values.global.lifecycleSidecarContainer }}
+          {{- if .Values.global.lifecycleSidecarContainer.resources }}
           resources: {{ toYaml .Values.global.lifecycleSidecarContainer.resources | nindent 12 }}
+          {{- end }}
+          {{- end }}
           env:
             - name: HOST_IP
               valueFrom:
@@ -351,10 +359,6 @@ spec:
             {{- if .Values.global.acls.manageSystemACLs }}
             - -token-file=/consul/service/acl-token
             {{- end }}
-          {{- if ( default .Values.global.lifecycleSidecarContainerResources .resources) }}
-          resources:
-            {{ toYaml (default .Values.global.lifecycleSidecarContainerResources .resources) | nindent 12 }}
-          {{- end }}
       {{- if .Values.meshGateway.priorityClassName }}
       priorityClassName: {{ .Values.meshGateway.priorityClassName | quote }}
       {{- end }}

diff --git a/templates/terminating-gateways-deployment.yaml b/templates/terminating-gateways-deployment.yaml
@@ -124,7 +124,12 @@ spec:
           volumeMounts:
           - name: consul-bin
             mountPath: /consul-bin
-          resources: {{ toYaml $root.Values.global.initContainer.resources | nindent 12 }}
+          {{- $initContainer := .initCopyConsulContainer }}
+          {{- if (or $initContainer $defaults.initCopyConsulContainer) }}
+          {{- if (default $defaults.initCopyConsulContainer.resources $initContainer.resources) }}
+          resources: {{ toYaml (default $defaults.initCopyConsulContainer.resources $initContainer.resources) | nindent 12 }}
+          {{- end }}
+          {{- end }}
         {{- if (and $root.Values.global.tls.enabled $root.Values.global.tls.enableAutoEncrypt) }}
         {{- include "consul.getAutoEncryptClientCA" $root | nindent 8 }}
         {{- end }}
@@ -327,7 +332,11 @@ spec:
               mountPath: /consul/tls/ca
               readOnly: true
             {{- end }}
+          {{- if  $root.Values.global.lifecycleSidecarContainer }}
+          {{- if $root.Values.global.lifecycleSidecarContainer.resources }}
           resources: {{ toYaml $root.Values.global.lifecycleSidecarContainer.resources | nindent 12 }}
+          {{- end }}
+          {{- end }}
           env:
             - name: HOST_IP
               valueFrom: