Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Removed use of vfc-redis from etsicatalog component"
[oom.git]
/
kubernetes
/
oof
/
charts
/
oof-cmso
/
charts
/
oof-cmso-service
/
templates
/
deployment.yaml
diff --git
a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/templates/deployment.yaml
b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/templates/deployment.yaml
index
1b17ed2
..
385d616
100644
(file)
--- a/
kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/templates/deployment.yaml
+++ b/
kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/templates/deployment.yaml
@@
-20,7
+20,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 }}
@@
-28,7
+28,7
@@
spec:
metadata:
labels:
app: {{ include "common.name" . }}
metadata:
labels:
app: {{ include "common.name" . }}
- release: {{
.Release.Name
}}
+ release: {{
include "common.release" .
}}
spec:
initContainers:
- command:
spec:
initContainers:
- command:
@@
-60,8
+60,8
@@
spec:
- name: DB_PASSWORD
valueFrom:
secretKeyRef:
- name: DB_PASSWORD
valueFrom:
secretKeyRef:
- name: {{
.Release.Name}}-cmso-db
- key:
db-root-
password
+ name: {{
include "common.release" . }}-cmso-db-db-root-password
+ key: password
terminationMessagePolicy: File
volumeMounts:
- name: {{ include "common.fullname" . }}-config
terminationMessagePolicy: File
volumeMounts:
- name: {{ include "common.fullname" . }}-config
@@
-90,7
+90,7
@@
spec:
- name: {{ include "common.fullname" . }}-config
mountPath: /share/etc/config
ports:
- name: {{ include "common.fullname" . }}-config
mountPath: /share/etc/config
ports:
- - containerPort: 5000
+ - containerPort: 5000
resources:
{{ include "common.resources" . }}
- name: {{ include "common.name" . }}
resources:
{{ include "common.resources" . }}
- name: {{ include "common.name" . }}
@@
-108,8
+108,8
@@
spec:
- name: DB_PASSWORD
valueFrom:
secretKeyRef:
- name: DB_PASSWORD
valueFrom:
secretKeyRef:
- name: {{
.Release.Name}}-cmso-db
- key:
user-
password
+ name: {{
include "common.release" . }}-cmso-db-db-user-credentials
+ key: password
- name: JAVA_TRUSTSTORE
value: /share/etc/certs/{{ .Values.global.truststoreFile }}
- name: SSL_KEYSTORE
- name: JAVA_TRUSTSTORE
value: /share/etc/certs/{{ .Values.global.truststoreFile }}
- name: SSL_KEYSTORE
@@
-180,9
+180,9
@@
spec:
emptyDir: {}
- name: filebeat-conf
configMap:
emptyDir: {}
- name: filebeat-conf
configMap:
- name: {{
.Release.Name
}}-cmso-filebeat-configmap
+ name: {{
include "common.release" .
}}-cmso-filebeat-configmap
- name: {{ include "common.fullname" . }}-certs
secret:
- name: {{ include "common.fullname" . }}-certs
secret:
- secretName: {{
.Release.Name
}}-{{ .Values.global.commonConfigPrefix }}-certs
+ secretName: {{
include "common.release" .
}}-{{ .Values.global.commonConfigPrefix }}-certs
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"