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: the IMS and DMS endpoint URL not correct when started in helm chart
[pti/o2.git]
/
charts
/
templates
/
deployment.yaml
diff --git
a/charts/templates/deployment.yaml
b/charts/templates/deployment.yaml
index
cdb54d6
..
7497d9f
100644
(file)
--- a/
charts/templates/deployment.yaml
+++ b/
charts/templates/deployment.yaml
@@
-50,44
+50,41
@@
spec:
volumeMounts:
\r
- name: scripts
\r
mountPath: /opt
\r
volumeMounts:
\r
- name: scripts
\r
mountPath: /opt
\r
- - name:
o2api
\r
- image:
"{{ .Values.o2ims.image.repository }}:{{ .Values.o2ims.image.tag }}"
\r
+ - name:
redis
\r
+ image:
redis:alpine
\r
ports:
\r
ports:
\r
- - containerPort: 80
\r
+ - containerPort: 6379
\r
+ - name: o2pubsub
\r
+ image: "{{ .Values.o2ims.image.repository }}:{{ .Values.o2ims.image.tag }}"
\r
+ command: ["/bin/bash", "/opt/o2pubsub_start.sh"]
\r
env:
\r
env:
\r
- - name: API_HOST
\r
- value: api
\r
- name: DB_HOST
\r
value: postgres
\r
- name: DB_PASSWORD
\r
value: o2ims123
\r
- name: DB_HOST
\r
value: postgres
\r
- name: DB_PASSWORD
\r
value: o2ims123
\r
- - name: FLASK_APP
\r
- value: /root/o2/o2app/entrypoints/flask_application.py
\r
- - name: FLASK_DEBUG
\r
- value: {{ .Values.o2ims.logginglevel }}
\r
- name: LOGGING_CONFIG_LEVEL
\r
value: {{ .Values.o2ims.logginglevel }}
\r
- name: OS_AUTH_URL
\r
- name: LOGGING_CONFIG_LEVEL
\r
value: {{ .Values.o2ims.logginglevel }}
\r
- name: OS_AUTH_URL
\r
+ value: {{ .Values.ocloud.OS_AUTH_URL }}
\r
- name: OS_PASSWORD
\r
- name: OS_PASSWORD
\r
+ value: {{ .Values.ocloud.OS_PASSWORD }}
\r
- name: OS_USERNAME
\r
- name: OS_USERNAME
\r
+ value: {{ .Values.ocloud.OS_USERNAME }}
\r
- name: PYTHONDONTWRITEBYTECODE
\r
value: "1"
\r
- name: PYTHONDONTWRITEBYTECODE
\r
value: "1"
\r
- - name: PYTHONUNBUFFERED
\r
- value: "1"
\r
- name: REDIS_HOST
\r
value: redis
\r
- name: REDIS_HOST
\r
value: redis
\r
- command: ["/bin/bash", "/opt/o2api_start.sh"]
\r
+ - name: K8S_KUBECONFIG
\r
+ value: {{ .Values.ocloud.K8S_KUBECONFIG }}
\r
volumeMounts:
\r
- name: scripts
\r
mountPath: /opt
\r
volumeMounts:
\r
- name: scripts
\r
mountPath: /opt
\r
- - name: redis
\r
- image: redis:alpine
\r
- ports:
\r
- - containerPort: 6379
\r
- name: watcher
\r
image: "{{ .Values.o2ims.image.repository }}:{{ .Values.o2ims.image.tag }}"
\r
command: ["/bin/bash", "/opt/o2watcher_start.sh"]
\r
env:
\r
- name: watcher
\r
image: "{{ .Values.o2ims.image.repository }}:{{ .Values.o2ims.image.tag }}"
\r
command: ["/bin/bash", "/opt/o2watcher_start.sh"]
\r
env:
\r
+ - name: API_HOST_EXTERNAL_FLOATING
\r
+ value: {{ .Values.ocloud.API_HOST_EXTERNAL_FLOATING }}
\r
- name: DB_HOST
\r
value: postgres
\r
- name: DB_PASSWORD
\r
- name: DB_HOST
\r
value: postgres
\r
- name: DB_PASSWORD
\r
@@
-107,26
+104,33
@@
spec:
volumeMounts:
\r
- name: scripts
\r
mountPath: /opt
\r
volumeMounts:
\r
- name: scripts
\r
mountPath: /opt
\r
- - name: o2
pubsub
\r
+ - name: o2
api
\r
image: "{{ .Values.o2ims.image.repository }}:{{ .Values.o2ims.image.tag }}"
\r
image: "{{ .Values.o2ims.image.repository }}:{{ .Values.o2ims.image.tag }}"
\r
- command: ["/bin/bash", "/opt/o2pubsub_start.sh"]
\r
+ ports:
\r
+ - containerPort: 80
\r
env:
\r
env:
\r
+ - name: API_HOST
\r
+ value: api
\r
- name: DB_HOST
\r
value: postgres
\r
- name: DB_PASSWORD
\r
value: o2ims123
\r
- name: DB_HOST
\r
value: postgres
\r
- name: DB_PASSWORD
\r
value: o2ims123
\r
+ - name: FLASK_APP
\r
+ value: /root/o2/o2app/entrypoints/flask_application.py
\r
+ - name: FLASK_DEBUG
\r
+ value: {{ .Values.o2ims.logginglevel }}
\r
- name: LOGGING_CONFIG_LEVEL
\r
value: {{ .Values.o2ims.logginglevel }}
\r
- name: OS_AUTH_URL
\r
- name: LOGGING_CONFIG_LEVEL
\r
value: {{ .Values.o2ims.logginglevel }}
\r
- name: OS_AUTH_URL
\r
- value: {{ .Values.ocloud.OS_AUTH_URL }}
\r
- name: OS_PASSWORD
\r
- name: OS_PASSWORD
\r
- value: {{ .Values.ocloud.OS_PASSWORD }}
\r
- name: OS_USERNAME
\r
- name: OS_USERNAME
\r
- value: {{ .Values.ocloud.OS_USERNAME }}
\r
- name: PYTHONDONTWRITEBYTECODE
\r
value: "1"
\r
- name: PYTHONDONTWRITEBYTECODE
\r
value: "1"
\r
+ - name: PYTHONUNBUFFERED
\r
+ value: "1"
\r
- name: REDIS_HOST
\r
value: redis
\r
- name: REDIS_HOST
\r
value: redis
\r
+ command: ["/bin/bash", "/opt/o2api_start.sh"]
\r
volumeMounts:
\r
- name: scripts
\r
mountPath: /opt
\r
volumeMounts:
\r
- name: scripts
\r
mountPath: /opt
\r