Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Added trust store for SOL003 Adapter & ETSI Catalog Manager
[oom.git]
/
kubernetes
/
so
/
charts
/
so-vnfm-adapter
/
templates
/
deployment.yaml
diff --git
a/kubernetes/so/charts/so-vnfm-adapter/templates/deployment.yaml
b/kubernetes/so/charts/so-vnfm-adapter/templates/deployment.yaml
index
00b36a8
..
a720753
100755
(executable)
--- a/
kubernetes/so/charts/so-vnfm-adapter/templates/deployment.yaml
+++ b/
kubernetes/so/charts/so-vnfm-adapter/templates/deployment.yaml
@@
-40,17
+40,17
@@
spec:
image: {{ include "common.repository" . }}/{{ .Values.image }}
resources:
{{ include "common.resources" . | indent 12 }}
image: {{ include "common.repository" . }}/{{ .Values.image }}
resources:
{{ include "common.resources" . | indent 12 }}
- {{- if eq .Values.global.security.aaf.enabled true }}
env:
- name: TRUSTSTORE
env:
- name: TRUSTSTORE
- value:
/app/org.onap.so.trust.jks
+ value:
{{ .Values.global.client.certs.truststore }}
- name: TRUSTSTORE_PASSWORD
valueFrom:
secretKeyRef:
name: {{ .Release.Name}}-so-client-certs-secret
key: trustStorePassword
- name: TRUSTSTORE_PASSWORD
valueFrom:
secretKeyRef:
name: {{ .Release.Name}}-so-client-certs-secret
key: trustStorePassword
+ {{ if eq .Values.global.security.aaf.enabled true }}
- name: KEYSTORE
- name: KEYSTORE
- value:
/app/org.onap.so.jks
+ value:
{{ .Values.global.client.certs.keystore }}
- name: KEYSTORE_PASSWORD
valueFrom:
secretKeyRef:
- name: KEYSTORE_PASSWORD
valueFrom:
secretKeyRef:
@@
-67,6
+67,9
@@
spec:
- name: config
mountPath: /app/config
readOnly: true
- name: config
mountPath: /app/config
readOnly: true
+ - name: {{ include "common.fullname" . }}-truststore
+ mountPath: /app/client
+ readonly: true
livenessProbe:
tcpSocket:
port: {{ index .Values.livenessProbe.port }}
livenessProbe:
tcpSocket:
port: {{ index .Values.livenessProbe.port }}
@@
-84,5
+87,8
@@
spec:
- name: config
configMap:
name: {{ include "common.fullname" . }}-app-configmap
- name: config
configMap:
name: {{ include "common.fullname" . }}-app-configmap
+ - name: {{ include "common.fullname" . }}-truststore
+ secret:
+ secretName: {{ include "common.release" . }}-so-truststore-secret
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"