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
Make the auth error in ProblemDetails.
[pti/o2.git]
/
charts
/
templates
/
deployment.yaml
diff --git
a/charts/templates/deployment.yaml
b/charts/templates/deployment.yaml
index
d229f44
..
98dc174
100644
(file)
--- a/
charts/templates/deployment.yaml
+++ b/
charts/templates/deployment.yaml
@@
-31,15
+31,19
@@
spec:
app: o2api
spec:
serviceAccountName: {{ .Values.o2ims.serviceaccountname }}
app: o2api
spec:
serviceAccountName: {{ .Values.o2ims.serviceaccountname }}
+ {{- if .Values.imagePullSecrets }}
imagePullSecrets:
imagePullSecrets:
- - name: {{ .Values.o2ims.imagePullSecrets }}
+ {{- 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:
@@
-47,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
@@
-80,8
+88,15
@@
spec:
volumeMounts:
- name: scripts
mountPath: /opt
volumeMounts:
- name: scripts
mountPath: /opt
+ - name: applicationconfig
+ 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
@@
-105,8
+120,12
@@
spec:
volumeMounts:
- name: scripts
mountPath: /opt
volumeMounts:
- name: scripts
mountPath: /opt
+ - name: applicationconfig
+ mountPath: /configs/o2app.conf
+ subPath: config.json
+ readOnly: true
- name: o2api
- 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:
@@
-117,7
+136,7
@@
spec:
- name: DB_PASSWORD
value: o2ims123
- name: FLASK_APP
- name: DB_PASSWORD
value: o2ims123
- name: FLASK_APP
- value: /
root/o2
/o2app/entrypoints/flask_application.py
+ value: /
src
/o2app/entrypoints/flask_application.py
- name: FLASK_DEBUG
value: {{ .Values.o2ims.logginglevel }}
- name: LOGGING_CONFIG_LEVEL
- name: FLASK_DEBUG
value: {{ .Values.o2ims.logginglevel }}
- name: LOGGING_CONFIG_LEVEL
@@
-137,22
+156,23
@@
spec:
volumeMounts:
- name: scripts
mountPath: /opt
volumeMounts:
- name: scripts
mountPath: /opt
- - name: configs
- mountPath: /configs
+
#
- name: configs
+
#
mountPath: /configs
- name: applicationconfig
mountPath: /configs/o2app.conf
subPath: config.json
readOnly: true
- name: applicationconfig
mountPath: /configs/o2app.conf
subPath: config.json
readOnly: true
- - name:
caconfig
- mountPath: /configs/
ca.ce
rt
+ - name:
servercrt
+ mountPath: /configs/
server.c
rt
subPath: config.json
readOnly: true
subPath: config.json
readOnly: true
- - name: serverkey
config
+ - name: serverkey
mountPath: /configs/server.key
subPath: config.json
readOnly: true
mountPath: /configs/server.key
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:
@@
-164,20
+184,26
@@
spec:
volumeMounts:
- name: scripts
mountPath: /opt
volumeMounts:
- name: scripts
mountPath: /opt
+ {{- end }}
volumes:
- name: scripts
configMap:
name: {{ .Chart.Name }}-scripts-configmap
volumes:
- name: scripts
configMap:
name: {{ .Chart.Name }}-scripts-configmap
- - name: configs
- emptyDir: {}
+
#
- name: configs
+
#
emptyDir: {}
- configMap:
name: {{ .Chart.Name }}-application-config
name: applicationconfig
- configMap:
- configMap:
name: {{ .Chart.Name }}-application-config
name: applicationconfig
- configMap:
- name: {{ .Chart.Name }}-serverkey
config
- name: serverkey
config
+ name: {{ .Chart.Name }}-serverkey
+ name: serverkey
- configMap:
- configMap:
- name: {{ .Chart.Name }}-caconfig
- name: caconfig
+ name: {{ .Chart.Name }}-servercrt
+ name: servercrt
+ - configMap:
+ name: {{ .Chart.Name }}-smocacrt
+ name: smocacrt
+ - name: db-pv
+ persistentVolumeClaim:
+ claimName: {{ .Chart.Name }}-db-pv
---
---
-