From 074ae58151b0fe8ed0d1bebf981c0826d3b5e622 Mon Sep 17 00:00:00 2001 From: Bin Yang Date: Fri, 21 Oct 2022 14:35:57 +0800 Subject: [PATCH] Update helm chart to refer built app file Issue-ID: INF-317 Signed-off-by: Bin Yang Change-Id: I183ad4460a90a12cd1ae43e8a418563b343d758e --- charts/resources/scripts/init/o2api_start.sh | 8 ++++---- charts/resources/scripts/init/o2pubsub_start.sh | 9 +++++---- charts/resources/scripts/init/o2watcher_start.sh | 9 +++++---- charts/templates/deployment.yaml | 6 +++--- 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/charts/resources/scripts/init/o2api_start.sh b/charts/resources/scripts/init/o2api_start.sh index 65f3cbd..5c8fcd6 100644 --- a/charts/resources/scripts/init/o2api_start.sh +++ b/charts/resources/scripts/init/o2api_start.sh @@ -15,14 +15,14 @@ #!/bin/bash # pull latest code to debug -cd /root/ -git clone "https://gerrit.o-ran-sc.org/r/pti/o2" +# cd /root/ +# git clone "https://gerrit.o-ran-sc.org/r/pti/o2" # cd o2 # git pull https://gerrit.o-ran-sc.org/r/pti/o2 refs/changes/85/7085/5 # pip install retry -pip install -e /root/o2 - +# pip install -e /root/o2 +pip install -e /src cat <>/etc/hosts 127.0.0.1 api diff --git a/charts/resources/scripts/init/o2pubsub_start.sh b/charts/resources/scripts/init/o2pubsub_start.sh index 5dff1b3..6b54b12 100644 --- a/charts/resources/scripts/init/o2pubsub_start.sh +++ b/charts/resources/scripts/init/o2pubsub_start.sh @@ -15,10 +15,11 @@ #!/bin/bash # pull latest code to debug -cd /root/ -git clone "https://gerrit.o-ran-sc.org/r/pti/o2" -pip install -e /root/o2 +# cd /root/ +# git clone "https://gerrit.o-ran-sc.org/r/pti/o2" +# pip install -e /root/o2 -python /root/o2/o2app/entrypoints/redis_eventconsumer.py +# python /root/o2/o2app/entrypoints/redis_eventconsumer.py +python /src/o2app/entrypoints/redis_eventconsumer.py sleep infinity diff --git a/charts/resources/scripts/init/o2watcher_start.sh b/charts/resources/scripts/init/o2watcher_start.sh index 643c27d..d4add91 100644 --- a/charts/resources/scripts/init/o2watcher_start.sh +++ b/charts/resources/scripts/init/o2watcher_start.sh @@ -15,10 +15,11 @@ #!/bin/bash # pull latest code to debug -cd /root/ -git clone "https://gerrit.o-ran-sc.org/r/pti/o2" -pip install -e /root/o2 +# cd /root/ +# git clone "https://gerrit.o-ran-sc.org/r/pti/o2" +# pip install -e /root/o2 -python /root/o2/o2app/entrypoints/resource_watcher.py +# python /root/o2/o2app/entrypoints/resource_watcher.py +python /src/o2app/entrypoints/resource_watcher.py sleep infinity diff --git a/charts/templates/deployment.yaml b/charts/templates/deployment.yaml index 5d82063..a9ea8fd 100644 --- a/charts/templates/deployment.yaml +++ b/charts/templates/deployment.yaml @@ -31,8 +31,8 @@ spec: app: o2api spec: serviceAccountName: {{ .Values.o2ims.serviceaccountname }} - imagePullSecrets: - - name: {{ .Values.o2ims.imagePullSecrets }} + # imagePullSecrets: + # - name: {{ .Values.o2ims.imagePullSecrets }} {{- if .Values.o2ims.affinity }} affinity: {{ toYaml .Values.o2ims.affinity | indent 8 }} @@ -117,7 +117,7 @@ spec: - name: DB_PASSWORD value: o2ims123 - name: FLASK_APP - value: /root/o2/o2app/entrypoints/flask_application.py + value: /src/o2app/entrypoints/flask_application.py - name: FLASK_DEBUG value: {{ .Values.o2ims.logginglevel }} - name: LOGGING_CONFIG_LEVEL -- 2.16.6