From 12249c7669e487cd9f37cee8475c89eb5490e0f0 Mon Sep 17 00:00:00 2001 From: dliu5 Date: Sat, 22 Oct 2022 10:45:22 +0800 Subject: [PATCH] Fix the docker app config mount issue and installation inconsistency Signed-off-by: dliu5 Change-Id: Iae3afcdf3c5a760d7dea606fbcccdf06c56d9450 --- charts/templates/deployment.yaml | 8 ++++++++ docs/installation-guide.rst | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/charts/templates/deployment.yaml b/charts/templates/deployment.yaml index 5f64ccb..194ca7e 100644 --- a/charts/templates/deployment.yaml +++ b/charts/templates/deployment.yaml @@ -82,6 +82,10 @@ spec: volumeMounts: - name: scripts mountPath: /opt + - name: applicationconfig + mountPath: /configs/o2app.conf + subPath: config.json + readOnly: true - name: watcher image: "{{ .Values.o2ims.image.repository }}:{{ .Values.o2ims.image.tag }}" command: ["/bin/bash", "/opt/o2watcher_start.sh"] @@ -107,6 +111,10 @@ spec: volumeMounts: - name: scripts mountPath: /opt + - name: applicationconfig + mountPath: /configs/o2app.conf + subPath: config.json + readOnly: true - name: o2api image: "{{ .Values.o2ims.image.repository }}:{{ .Values.o2ims.image.tag }}" ports: diff --git a/docs/installation-guide.rst b/docs/installation-guide.rst index 7c19274..4c3e2bc 100644 --- a/docs/installation-guide.rst +++ b/docs/installation-guide.rst @@ -256,7 +256,7 @@ The following instruction should be done outside of INF platform controller host .. code:: shell - helm install o2service o2/charts --set-file caconfig="./imsserver.cert" --set-file applicationconfig="./app.conf" --set-file serverkeyconfig="./imsserver.key" -f o2service-override.yaml + helm install o2service o2/charts --set-file caconfig="./imsserver.crt" --set-file applicationconfig="./app.conf" --set-file serverkeyconfig="./imsserver.key" -f o2service-override.yaml helm list |grep o2service kubectl -n ${NAMESPACE} get pods |grep o2api kubectl -n ${NAMESPACE} get services |grep o2api -- 2.16.6