Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Updating charts to use common resource template
[oom.git]
/
kubernetes
/
portal
/
charts
/
portal-app
/
templates
/
deployment.yaml
diff --git
a/kubernetes/portal/charts/portal-app/templates/deployment.yaml
b/kubernetes/portal/charts/portal-app/templates/deployment.yaml
index
7ed8cca
..
2ab570a
100644
(file)
--- a/
kubernetes/portal/charts/portal-app/templates/deployment.yaml
+++ b/
kubernetes/portal/charts/portal-app/templates/deployment.yaml
@@
-47,7
+47,7
@@
spec:
fieldPath: metadata.namespace
containers:
- name: {{ include "common.name" . }}
fieldPath: metadata.namespace
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 }}
command:
- /start-apache-tomcat.sh
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command:
- /start-apache-tomcat.sh
@@
-98,7
+98,7
@@
spec:
- name: var-log-onap
mountPath: /var/log/onap
resources:
- name: var-log-onap
mountPath: /var/log/onap
resources:
-{{
toYaml .Values.resources
| indent 12 }}
+{{
include "common.resources" .
| indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
@@
-136,4
+136,4
@@
spec:
- name: portal-tomcat-logs
emptyDir: {}
imagePullSecrets:
- name: portal-tomcat-logs
emptyDir: {}
imagePullSecrets:
- - name: "{{ include "common.namespace" . }}-docker-registry-key"
\ No newline at end of file
+ - name: "{{ include "common.namespace" . }}-docker-registry-key"