From: Krzysztof Opasiak Date: Tue, 27 Oct 2020 17:00:58 +0000 (+0000) Subject: Merge "[CONSUL] Add limits to consul chart." X-Git-Tag: 7.0.0~69 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=oom.git;a=commitdiff_plain;h=b1ee058f941a9c9ff27467054d98b8a56c988797;hp=-c Merge "[CONSUL] Add limits to consul chart." --- b1ee058f941a9c9ff27467054d98b8a56c988797 diff --combined kubernetes/consul/charts/consul-server/templates/statefulset.yaml index 02263eeced,549fb3a159..430b6dd1bd --- a/kubernetes/consul/charts/consul-server/templates/statefulset.yaml +++ b/kubernetes/consul/charts/consul-server/templates/statefulset.yaml @@@ -1,4 -1,3 +1,4 @@@ +{{/* # Copyright © 2017 Amdocs, Bell Canada # Modifications Copyright © 2018 AT&T # @@@ -13,7 -12,6 +13,7 @@@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +*/}} apiVersion: apps/v1 kind: StatefulSet @@@ -70,3 -68,4 +70,4 @@@ spec port: {{ .Values.service.internalPort }} initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }} periodSeconds: {{ .Values.readiness.periodSeconds }} + resources: {{ include "common.resources" . | nindent 10 }} diff --combined kubernetes/consul/templates/deployment.yaml index a5b72aedee,449ed9b480..51c6eb72d5 --- a/kubernetes/consul/templates/deployment.yaml +++ b/kubernetes/consul/templates/deployment.yaml @@@ -1,4 -1,3 +1,4 @@@ +{{/* # Copyright © 2017 Amdocs, Bell Canada # Modifications Copyright © 2018 AT&T # @@@ -13,7 -12,6 +13,7 @@@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +*/}} apiVersion: apps/v1 kind: Deployment @@@ -61,6 -59,7 +61,7 @@@ spec name: consul-agent-scripts-config - mountPath: /consul/certs name: consul-agent-certs-config + resources: {{ include "common.resources" . | nindent 10 }} volumes: - configMap: name: {{ include "common.fullname" . }}-configmap