Mostly working

Signed-off-by: Fabian von Feilitzsch <fabian@fabianism.us>
konveyor · Aug 12, 2024 · fe87544 · fe87544
1 parent 9a025d8
commit fe87544
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 7 deletions.
diff --git a/roles/tackle/tasks/kai.yml b/roles/tackle/tasks/kai.yml
@@ -8,8 +8,6 @@
     namespace: "{{ app_namespace }}"
   register: kai_api_key_secret_status
 
-- debug: var=kai_api_key_secret_status
-
 - when: (kai_api_key_secret_status.resources|length) > 0
   block:
     - name: Check if JWT token secret is defined
@@ -43,11 +41,17 @@
             name: "{{ kai_db_secret_name }}"
             namespace: "{{ app_namespace }}"
           stringData:
+            POSTGRES_HOST: kai-db
             POSTGRES_DB: kai
             POSTGRES_PASSWORD: "{{ pg_password }}"
             POSTGRES_USER: kai
       when: (kai_db_secret_status.resources|length) == 0
 
+    - name: Decode pg_password from secret
+      set_fact:
+        pg_password: "{{ kai_db_secret_status.resources.0.data.POSTGRES_PASSWORD | b64decode }}"
+      when: (kai_db_secret_status.resources|length) > 0
+
     - name: Retrieve Hub Secret
       kubernetes.core.k8s_info:
         api_version: v1

diff --git a/roles/tackle/templates/kai/kai-api-deployment.yaml.j2 b/roles/tackle/templates/kai/kai-api-deployment.yaml.j2
@@ -17,10 +17,15 @@ spec:
       containers:
         - name: kai-api
           # TODO: Update image variable
-          image: "{{ IMAGE | default('quay.io/konveyor/kai:stable') }}"
+          image: "{{ IMAGE | default('quay.io/konveyor/kai:latest') }}"
           ports:
             - containerPort: 8080
           env:
+            - name: POSTGRES_HOST
+              valueFrom:
+                secretKeyRef:
+                  name: "{{ kai_db_secret_name }}"
+                  key: POSTGRES_HOST
             - name: POSTGRES_DB
               valueFrom:
                 secretKeyRef:

diff --git a/roles/tackle/templates/kai/kai-db-deployment.yaml.j2 b/roles/tackle/templates/kai/kai-db-deployment.yaml.j2
@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
         - name: kai-db
-          image: docker.io/pgvector/pgvector:pg15
+          image: docker.io/library/postgres:16.3
           env:
             - name: POSTGRES_DB
               valueFrom:

diff --git a/roles/tackle/templates/kai/kai-importer-deployment.yaml.j2 b/roles/tackle/templates/kai/kai-importer-deployment.yaml.j2
@@ -17,8 +17,13 @@ spec:
       containers:
         - name: kai-hub-importer
           # TODO: image variable
-          image: "{{ IMAGE | default('quay.io/konveyor/kai:stable') }}"
+          image: "{{ IMAGE | default('quay.io/konveyor/kai:latest') }}"
           env:
+            - name: POSTGRES_HOST
+              valueFrom:
+                secretKeyRef:
+                  name: "{{ kai_db_secret_name }}"
+                  key: POSTGRES_HOST
             - name: POSTGRES_DB
               valueFrom:
                 secretKeyRef:
@@ -36,10 +41,12 @@ spec:
                   key: POSTGRES_USER
             - name: DEMO_MODE
               value: "False"
+            # TODO variable for this
             - name: HUB_URL
-              value: "{{ HUB_URL | default('') }}"
+              value: "{{ konveyor_hub_url | default('http://tackle-hub.konveyor.svc:8080') }}"
+            # TODO: unset this, fix bug in entrypoint
             - name: IMPORTER_ARGS
-              value: ""
+              value: "-k"
             - name: LOGLEVEL
               value: "info"
             - name: NUM_WORKERS
@@ -48,6 +55,21 @@ spec:
               value: "True"
             - name: MODE
               value: "importer"
+            - name: GENAI_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: "{{ kai_api_key_secret_name }}"
+                  key: api_key
+            - name: OPENAI_API_BASE
+              valueFrom:
+                secretKeyRef:
+                  name: "{{ kai_api_key_secret_name }}"
+                  key: api_base
+            - name: OPENAI_API_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: "{{ kai_api_key_secret_name }}"
+                  key: api_key
             - name: JWT
               valueFrom:
                 secretKeyRef: