Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[COMMON] Add new template for obtaining certificate
[oom.git]
/
kubernetes
/
nbi
/
templates
/
deployment.yaml
diff --git
a/kubernetes/nbi/templates/deployment.yaml
b/kubernetes/nbi/templates/deployment.yaml
index
3283239
..
22dd4a1
100644
(file)
--- a/
kubernetes/nbi/templates/deployment.yaml
+++ b/
kubernetes/nbi/templates/deployment.yaml
@@
-33,7
+33,7
@@
spec:
name: {{ include "common.fullname" . }}
spec:
{{- if .Values.global.aafEnabled }}
name: {{ include "common.fullname" . }}
spec:
{{- if .Values.global.aafEnabled }}
- initContainers: {{ include "common.
aaf-config
" . | nindent 6 }}
+ initContainers: {{ include "common.
certInitializer.initContainer
" . | nindent 6 }}
{{- end }}
containers:
- name: {{ include "common.name" . }}
{{- end }}
containers:
- name: {{ include "common.name" . }}
@@
-49,18
+49,15
@@
spec:
args:
- -c
- |
args:
- -c
- |
- export $(grep '^c' {{ .Values.
aafConfig
.credsPath }}/mycreds.prop | xargs -0)
+ export $(grep '^c' {{ .Values.
certInitializer
.credsPath }}/mycreds.prop | xargs -0)
export JAVA_OPTS="-Djavax.net.ssl.trustStorePassword=$cadi_truststore_password \
export JAVA_OPTS="-Djavax.net.ssl.trustStorePassword=$cadi_truststore_password \
- -Dserver.ssl.key-store={{ .Values.
aafConfig
.credsPath }}/org.onap.nbi.p12 \
+ -Dserver.ssl.key-store={{ .Values.
certInitializer
.credsPath }}/org.onap.nbi.p12 \
-Dserver.ssl.key-store-type=PKCS12 \
-Dserver.ssl.key-store-type=PKCS12 \
- -Djavax.net.ssl.trustStore={{ .Values.
aafConfig
.credsPath }}/org.onap.nbi.trust.jks \
+ -Djavax.net.ssl.trustStore={{ .Values.
certInitializer
.credsPath }}/org.onap.nbi.trust.jks \
-Dserver.ssl.key-store-password=$cadi_keystore_password_p12 \
-Djavax.net.ssl.trustStoreType=jks\
-Djava.security.egd=file:/dev/./urandom -Dserver.port=8443"
-Dserver.ssl.key-store-password=$cadi_keystore_password_p12 \
-Djavax.net.ssl.trustStoreType=jks\
-Djava.security.egd=file:/dev/./urandom -Dserver.port=8443"
- {{- if eq "DEBUG" .Values.config.loglevel }}
- export JAVA_DEBUG="-Djavax.net.debug=all"
- {{- end }}
- exec java -XX:+UseContainerSupport $JAVA_DEBUG $JAVA_OPTS -jar /opt/onap/app.jar
+ exec java -XX:+UseContainerSupport $JAVA_OPTS -jar /opt/onap/app.jar
{{- end }}
{{ if .Values.liveness.enabled }}
livenessProbe:
{{- end }}
{{ if .Values.liveness.enabled }}
livenessProbe:
@@
-116,7
+113,7
@@
spec:
value: {{ .Values.so_authorization }}
{{- end }}
- name: DMAAP_HOST
value: {{ .Values.so_authorization }}
{{- end }}
- name: DMAAP_HOST
- value: "http
://message-router.{{ include "common.namespace" . }}:3904
"
+ value: "http
s://message-router.{{ include "common.namespace" . }}:3905
"
- 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
@@
-125,7
+122,7
@@
spec:
value: "msb-discovery.{{ include "common.namespace" . }}"
- name: MSB_DISCOVERY_PORT
value: "10081"
value: "msb-discovery.{{ include "common.namespace" . }}"
- name: MSB_DISCOVERY_PORT
value: "10081"
- volumeMounts: {{ include "common.
aaf-config-volume-mountpath
" . | nindent 12 }}
+ volumeMounts: {{ include "common.
certInitializer.volumeMount
" . | nindent 12 }}
- mountPath: /etc/localtime
name: localtime
readOnly: true
- mountPath: /etc/localtime
name: localtime
readOnly: true
@@
-151,7
+148,7
@@
spec:
# name: esr-server-logs
# - mountPath: /usr/share/filebeat/data
# name: esr-server-filebeat
# name: esr-server-logs
# - mountPath: /usr/share/filebeat/data
# name: esr-server-filebeat
- volumes: {{ include "common.
aaf-config-
volumes" . | nindent 8 }}
+ volumes: {{ include "common.
certInitializer.
volumes" . | nindent 8 }}
- name: localtime
hostPath:
path: /etc/localtime
- name: localtime
hostPath:
path: /etc/localtime