app deployment using shared ArgoCD (#182)

Author: guimou

app/backend/chatbot.py

@@ -77,14 +77,15 @@ def __init__(self, config, logger):
     def format_sources(self, input_list):
         sources = ""
         if len(input_list) != 0:
-            sources += input_list[0].metadata["source"] + ', page: ' + str(input_list[0].metadata["page"])
-            page_list = [input_list[0].metadata["page"]]
+            sources += input_list[0].metadata["metadata"]["source"] + ', page: ' + str(input_list[0].metadata["metadata"]["page"])
+            page_list = [input_list[0].metadata["metadata"]["page"]]
             for item in input_list:
-                if item.metadata["page"] not in page_list: # Avoid duplicates
-                    page_list.append(item.metadata["page"])
-                    sources += ', ' + str(item.metadata["page"])
+                if item.metadata["metadata"]["page"] not in page_list: # Avoid duplicates
+                    page_list.append(item.metadata["metadata"]["page"])
+                    sources += ', ' + str(item.metadata["metadata"]["page"])
         return sources
 
+
     def stream(self, query, claim) -> Generator:
         # A Queue is needed for Streaming implementation
         q = Queue()

bootstrap/ic-rhoai-configuration/job-patch-code-server.yaml

@@ -19,7 +19,7 @@ spec:
     spec:
       containers:
         - name: insurance-claim-app
-          image: quay.io/rh-aiservices-bu/rhoai-lab-insurance-claim-app:2.2.0
+          image: quay.io/rh-aiservices-bu/rhoai-lab-insurance-claim-app:2.2.1
           ports:
             - containerPort: 5000
               protocol: TCP

bootstrap/ic-shared-app/deployment-app.yaml

@@ -24,7 +24,8 @@ spec:
         args:
         - -ec
         - |-
-          git clone https://github.com/rh-aiservices-bu/parasol-insurance.git
+          BRANCH_NAME="dev"
+          git clone https://github.com/rh-aiservices-bu/parasol-insurance.git && cd parasol-insurance && git checkout $BRANCH_NAME
 
           cat << 'EOF' | python3
           import boto3, os, botocore
@@ -43,13 +44,13 @@ spec:
               s3.create_bucket(Bucket=bucket_name)
 
           # Upload original images to minio
-          for filename in os.listdir("parasol-insurance/bootstrap/ic-shared-database/images/original_images"):
-              with open(f"parasol-insurance/bootstrap/ic-shared-database/images/original_images/{filename}", "rb") as f:
+          for filename in os.listdir("/opt/app-root/src/parasol-insurance/bootstrap/ic-shared-database/images/original_images"):
+              with open(f"/opt/app-root/src/parasol-insurance/bootstrap/ic-shared-database/images/original_images/{filename}", "rb") as f:
                   s3.upload_fileobj(f, bucket_name, f"original_images/{filename}")
 
           # Upload processed images to minio
-          for filename in os.listdir("parasol-insurance/bootstrap/ic-shared-database/images/processed_images"):
-              with open(f"parasol-insurance/bootstrap/ic-shared-database/images/processed_images/{filename}", "rb") as f:
+          for filename in os.listdir("/opt/app-root/src/parasol-insurance/bootstrap/ic-shared-database/images/processed_images"):
+              with open(f"/opt/app-root/src/parasol-insurance/bootstrap/ic-shared-database/images/processed_images/{filename}", "rb") as f:
                   s3.upload_fileobj(f, bucket_name, f"processed_images/{filename}")
 
           EOF

bootstrap/ic-shared-database/populate-images.yaml

@@ -558,6 +558,30 @@ spec:
             volumeMode: Filesystem
           EOF
 
+          # Create the ArgoCD Project
+          cat << EOF | oc apply -f-
+          apiVersion: argoproj.io/v1alpha1
+          kind: AppProject
+          metadata:
+            name: project-$USER_PROJECT
+            namespace: openshift-gitops
+          spec:
+            description: Application project for $USER_PROJECT
+            destinations:
+              - name: in-cluster
+                namespace: $USER_PROJECT
+                server: 'https://kubernetes.default.svc'
+            roles:
+              - description: Sync privileges for any application
+                groups:
+                  - $USER_PROJECT
+                name: ci-role
+                policies:
+                  - 'p, proj:project-$USER_PROJECT:ci-role, applications, *, project-$USER_PROJECT/*, allow'
+            sourceRepos:
+              - 'https://github.com/rh-aiservices-bu/parasol-insurance.git'
+          EOF
+
           sleep 20
           
           done