Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[CONSUL] Add limits to consul chart.
[oom.git]
/
kubernetes
/
consul
/
templates
/
deployment.yaml
diff --git
a/kubernetes/consul/templates/deployment.yaml
b/kubernetes/consul/templates/deployment.yaml
index
f04d772
..
449ed9b
100644
(file)
--- a/
kubernetes/consul/templates/deployment.yaml
+++ b/
kubernetes/consul/templates/deployment.yaml
@@
-13,7
+13,7
@@
# See the License for the specific language governing permissions and
# limitations under the License.
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion:
extensions/v1beta
1
+apiVersion:
apps/v
1
kind: Deployment
metadata:
name: {{ include "common.fullname" . }}
kind: Deployment
metadata:
name: {{ include "common.fullname" . }}
@@
-21,7
+21,7
@@
metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{
.Release.Name
}}
+ release: {{
include "common.release" .
}}
heritage: {{ .Release.Service }}
spec:
replicas: {{ .Values.replicaCount }}
heritage: {{ .Release.Service }}
spec:
replicas: {{ .Values.replicaCount }}
@@
-32,7
+32,7
@@
spec:
metadata:
labels:
app: {{ include "common.name" . }}
metadata:
labels:
app: {{ include "common.name" . }}
- release: {{
.Release.Name
}}
+ release: {{
include "common.release" .
}}
name: {{ include "common.name" . }}
spec:
imagePullSecrets:
name: {{ include "common.name" . }}
spec:
imagePullSecrets:
@@
-59,6
+59,7
@@
spec:
name: consul-agent-scripts-config
- mountPath: /consul/certs
name: consul-agent-certs-config
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
volumes:
- configMap:
name: {{ include "common.fullname" . }}-configmap