Code Review
/
pti
/
o2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix INF-341 refactor name of resource pool to region id
[pti/o2.git]
/
charts
/
templates
/
deployment.yaml
diff --git
a/charts/templates/deployment.yaml
b/charts/templates/deployment.yaml
index
bcc8dc9
..
98dc174
100644
(file)
--- a/
charts/templates/deployment.yaml
+++ b/
charts/templates/deployment.yaml
@@
-31,17
+31,19
@@
spec:
app: o2api
spec:
serviceAccountName: {{ .Values.o2ims.serviceaccountname }}
app: o2api
spec:
serviceAccountName: {{ .Values.o2ims.serviceaccountname }}
- # imagePullSecrets:
- # - name: {{ .Values.o2ims.imagePullSecrets }}
+ {{- if .Values.imagePullSecrets }}
imagePullSecrets:
imagePullSecrets:
- - name: {{ .Values.o2ims.serviceaccountname }}-registry-secret
+ {{- range .Values.imagePullSecrets }}
+ - name: {{ . }}
+ {{- end }}
+ {{- end }}
{{- if .Values.o2ims.affinity }}
affinity:
{{ toYaml .Values.o2ims.affinity | indent 8 }}
{{- end }}
containers:
- name: postgres
{{- if .Values.o2ims.affinity }}
affinity:
{{ toYaml .Values.o2ims.affinity | indent 8 }}
{{- end }}
containers:
- name: postgres
- image:
postgres:9.6
+ image:
"{{ .Values.o2ims.images.tags.postgres }}"
ports:
- containerPort: 5432
env:
ports:
- containerPort: 5432
env:
@@
-49,16
+51,20
@@
spec:
value: o2ims123
- name: POSTGRES_USER
value: o2ims
value: o2ims123
- name: POSTGRES_USER
value: o2ims
+ - name: PGDATA
+ value: /var/lib/postgresql/data/pgdata
command: ["/bin/bash", "/opt/postgres_start.sh"]
volumeMounts:
- name: scripts
mountPath: /opt
command: ["/bin/bash", "/opt/postgres_start.sh"]
volumeMounts:
- name: scripts
mountPath: /opt
+ - name: db-pv
+ mountPath: /var/lib/postgresql/data
- name: redis
- name: redis
- image:
redis:alpine
+ image:
"{{ .Values.o2ims.images.tags.redis }}"
ports:
- containerPort: 6379
- name: o2pubsub
ports:
- containerPort: 6379
- name: o2pubsub
- image: "{{ .Values.o2ims.image
.repository }}:{{ .Values.o2ims.image.tag
}}"
+ image: "{{ .Values.o2ims.image
s.tags.o2service
}}"
command: ["/bin/bash", "/opt/o2pubsub_start.sh"]
env:
- name: DB_HOST
command: ["/bin/bash", "/opt/o2pubsub_start.sh"]
env:
- name: DB_HOST
@@
-86,8
+92,11
@@
spec:
mountPath: /configs/o2app.conf
subPath: config.json
readOnly: true
mountPath: /configs/o2app.conf
subPath: config.json
readOnly: true
+ - name: smocacrt
+ mountPath: /configs/smoca.crt
+ subPath: config.json
- name: watcher
- name: watcher
- image: "{{ .Values.o2ims.image
.repository }}:{{ .Values.o2ims.image.tag
}}"
+ image: "{{ .Values.o2ims.image
s.tags.o2service
}}"
command: ["/bin/bash", "/opt/o2watcher_start.sh"]
env:
- name: API_HOST_EXTERNAL_FLOATING
command: ["/bin/bash", "/opt/o2watcher_start.sh"]
env:
- name: API_HOST_EXTERNAL_FLOATING
@@
-116,7
+125,7
@@
spec:
subPath: config.json
readOnly: true
- name: o2api
subPath: config.json
readOnly: true
- name: o2api
- image: "{{ .Values.o2ims.image
.repository }}:{{ .Values.o2ims.image.tag
}}"
+ image: "{{ .Values.o2ims.image
s.tags.o2service
}}"
ports:
- containerPort: 80
env:
ports:
- containerPort: 80
env:
@@
-161,12
+170,9
@@
spec:
mountPath: /configs/server.key
subPath: config.json
readOnly: true
mountPath: /configs/server.key
subPath: config.json
readOnly: true
- - name: smocacrt
- mountPath: /configs/smoca.crt
- subPath: config.json
- readOnly: true
+ {{- if .Values.o2dms.helm_cli_enable }}
- name: helmcli
- name: helmcli
- image: "{{ .Values.o2ims.image
.repository }}:{{ .Values.o2ims.image.tag
}}"
+ image: "{{ .Values.o2ims.image
s.tags.o2service
}}"
ports:
- containerPort: 22
env:
ports:
- containerPort: 22
env:
@@
-178,6
+184,7
@@
spec:
volumeMounts:
- name: scripts
mountPath: /opt
volumeMounts:
- name: scripts
mountPath: /opt
+ {{- end }}
volumes:
- name: scripts
configMap:
volumes:
- name: scripts
configMap:
@@
-196,4
+203,7
@@
spec:
- configMap:
name: {{ .Chart.Name }}-smocacrt
name: smocacrt
- configMap:
name: {{ .Chart.Name }}-smocacrt
name: smocacrt
+ - name: db-pv
+ persistentVolumeClaim:
+ claimName: {{ .Chart.Name }}-db-pv
---
---