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 "[Portal] Adjust Pods Requests/Limits"
[oom.git]
/
kubernetes
/
nbi
/
templates
/
deployment.yaml
diff --git
a/kubernetes/nbi/templates/deployment.yaml
b/kubernetes/nbi/templates/deployment.yaml
index
30e6572
..
5223f41
100644
(file)
--- a/
kubernetes/nbi/templates/deployment.yaml
+++ b/
kubernetes/nbi/templates/deployment.yaml
@@
-54,9
+54,9
@@
spec:
periodSeconds: {{ .Values.readiness.periodSeconds }}
env:
- name: SPRING_DATASOURCE_URL
periodSeconds: {{ .Values.readiness.periodSeconds }}
env:
- name: SPRING_DATASOURCE_URL
- value: jdbc:mariadb://{{
.Values.mariadb.service.name }}.{{ include "common.namespace" . }}:{{.Values.mariadb.service.internalPort }}/{{ .Values.mariadb.config.db.database
}}
+ value: jdbc:mariadb://{{
index .Values "mariadb-galera" "service" "name" }}.{{ include "common.namespace" . }}:3306/{{ index .Values "mariadb-galera" "config" "mysqlDatabase"
}}
- name: SPRING_DATASOURCE_USERNAME
- name: SPRING_DATASOURCE_USERNAME
- value: {{
.Values.mariadb.config.db.user
}}
+ value: {{
index .Values "mariadb-galera" "config" "userName"
}}
- name: SPRING_DATASOURCE_PASSWORD
valueFrom:
secretKeyRef:
- name: SPRING_DATASOURCE_PASSWORD
valueFrom:
secretKeyRef:
@@
-75,7
+75,7
@@
spec:
- name: ONAP_CLOUDOWNER
value: {{ .Values.config.cloudOwner }}
- name: NBI_URL
- name: ONAP_CLOUDOWNER
value: {{ .Values.config.cloudOwner }}
- name: NBI_URL
- value: "http://nbi.{{ include "common.namespace" . }}:8080/nbi/api/v
3
"
+ value: "http://nbi.{{ include "common.namespace" . }}:8080/nbi/api/v
4
"
- name: SDC_HOST
value: "http://sdc-be.{{ include "common.namespace" . }}:8080"
- name: SDC_HEADER_ECOMPINSTANCEID
- name: SDC_HOST
value: "http://sdc-be.{{ include "common.namespace" . }}:8080"
- name: SDC_HEADER_ECOMPINSTANCEID
@@
-92,6
+92,8
@@
spec:
- name: SO_HEADER_AUTHORIZATION
value: {{ .Values.so_authorization }}
{{- end }}
- name: SO_HEADER_AUTHORIZATION
value: {{ .Values.so_authorization }}
{{- end }}
+ - name: DMAAP_HOST
+ value: "http://message-router.{{ include "common.namespace" . }}:3904"
- name: LOGGING_LEVEL_ORG_ONAP_NBI
value: {{ .Values.config.loglevel }}
- name: MSB_ENABLED
- name: LOGGING_LEVEL_ORG_ONAP_NBI
value: {{ .Values.config.loglevel }}
- name: MSB_ENABLED
@@
-105,7
+107,7
@@
spec:
name: localtime
readOnly: true
resources:
name: localtime
readOnly: true
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 }}