X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fpolicy%2Fcharts%2Fmariadb%2Ftemplates%2Fdeployment.yaml;h=c64fb9ab0f27405553ced67d8a45a7e9faef7213;hb=ed4a579fcddbb3028f7668923fa83d756bdf2f8f;hp=1709af7df23686008198165509f217de1d7a4a67;hpb=b2e4ea650381d9e109c23a9fe51980655500fb29;p=oom.git diff --git a/kubernetes/policy/charts/mariadb/templates/deployment.yaml b/kubernetes/policy/charts/mariadb/templates/deployment.yaml index 1709af7df2..c64fb9ab0f 100644 --- a/kubernetes/policy/charts/mariadb/templates/deployment.yaml +++ b/kubernetes/policy/charts/mariadb/templates/deployment.yaml @@ -1,4 +1,5 @@ # Copyright © 2017 Amdocs, Bell Canada +# Modifications Copyright © 2018 AT&T # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -32,7 +33,7 @@ spec: spec: containers: - name: {{ include "common.name" . }} - image: "{{ .Values.global.repository | default .Values.repository }}/{{ .Values.image }}" + image: "{{ include "common.repository" . }}/{{ .Values.image }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} ports: - containerPort: {{ .Values.service.internalPort }} @@ -41,6 +42,7 @@ spec: {{- if eq .Values.liveness.enabled true }} args: - --lower-case-table-names=1 + - --wait_timeout=28800 livenessProbe: tcpSocket: port: {{ .Values.service.internalPort }} @@ -74,7 +76,7 @@ spec: - mountPath: /var/lib/mysql name: mariadb-data resources: -{{ toYaml .Values.resources | indent 12 }} +{{ include "common.resources" . | indent 12 }} {{- if .Values.nodeSelector }} nodeSelector: {{ toYaml .Values.nodeSelector | indent 10 }}