Merge "Add helm chart for ca and config files."

diff --git a/charts/resources/scripts/init/o2api_start.sh b/charts/resources/scripts/init/o2api_start.sh
index 65f3cbd..5c8fcd6 100644 (file)
--- 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 <<EOF>>/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 (file)
--- 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 (file)
--- 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 d229f44..d9ebf10 100644 (file)
--- a/charts/templates/deployment.yaml
+++ b/charts/templates/deployment.yaml
@@ -31,8 +31,10 @@ spec:
         app: o2api
     spec:
       serviceAccountName: {{ .Values.o2ims.serviceaccountname }}
+      # imagePullSecrets:
+      #   - name: {{ .Values.o2ims.imagePullSecrets }}
       imagePullSecrets:
-        - name: {{ .Values.o2ims.imagePullSecrets }}
+        - name: {{ .Values.o2ims.serviceaccountname }}-registry-secret
 {{- if .Values.o2ims.affinity }}
       affinity:
 {{ toYaml .Values.o2ims.affinity | indent 8 }}
@@ -117,7 +119,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

diff --git a/charts/values.yaml b/charts/values.yaml
index bb31c34..9070606 100644 (file)
--- a/charts/values.yaml
+++ b/charts/values.yaml
@@ -36,7 +36,7 @@ global:
   namespace: orano2
 
 o2ims:
-  serviceaccountname: admin
+  serviceaccountname: admin-orano2
   image:
     repository: registry.local:9001/admin/o2imsdms
     tag: 0.1.1

diff --git a/stages/container-tag.yaml b/stages/container-tag.yaml
index 73a715b..64ab279 100644 (file)
--- a/stages/container-tag.yaml
+++ b/stages/container-tag.yaml
@@ -2,4 +2,4 @@
 # By default this file is in the docker build directory,
 # but the location can configured in the JJB template.
 ---
-tag: "1.0.0"
+tag: "2.0.0"