From b919e7dea2f3cf796d81a865d9bbeb5d4ecac9a3 Mon Sep 17 00:00:00 2001 From: Jeff Ortel Date: Tue, 10 Sep 2024 10:13:42 -0700 Subject: [PATCH] checkpoint Signed-off-by: Jeff Ortel --- roles/tackle/defaults/main.yml | 2 ++ roles/tackle/templates/deployment-hub.yml.j2 | 2 ++ roles/tackle/templates/deployment-ui.yml.j2 | 2 ++ roles/tackle/templates/kai/kai-api-service.yaml.j2 | 2 +- 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/roles/tackle/defaults/main.yml b/roles/tackle/defaults/main.yml index a9d9f461..e60d6030 100644 --- a/roles/tackle/defaults/main.yml +++ b/roles/tackle/defaults/main.yml @@ -228,6 +228,8 @@ experimental_deploy_kai: false kai_fqin: "{{ lookup('env', 'RELATED_IMAGE_KAI') }}" +kai_component_name: "kai-api" +kai_service_name: "{{ kai_component_name }}" kai_api_key_secret_name: kai-api-keys kai_jwt_secret_name: kai-jwt-secret kai_bam_secret_key: genai_key diff --git a/roles/tackle/templates/deployment-hub.yml.j2 b/roles/tackle/templates/deployment-hub.yml.j2 index c0c12221..700c9a40 100644 --- a/roles/tackle/templates/deployment-hub.yml.j2 +++ b/roles/tackle/templates/deployment-hub.yml.j2 @@ -192,6 +192,8 @@ spec: - name: DISCOVERY_ENABLED value: "false" {% endif %} + - name: KAI_URL + value: "http://{{ kai_service_name }}.{{ app_namespace }}.svc:8080" ports: - containerPort: {{ hub_port }} protocol: TCP diff --git a/roles/tackle/templates/deployment-ui.yml.j2 b/roles/tackle/templates/deployment-ui.yml.j2 index 951f6af6..334ecf9c 100644 --- a/roles/tackle/templates/deployment-ui.yml.j2 +++ b/roles/tackle/templates/deployment-ui.yml.j2 @@ -127,6 +127,8 @@ spec: {% endif %} - name: RWX_SUPPORTED value: "{{ rwx_supported | string | lower }}" + - name: KAI_URL + value: "{{ hub_url }}/services/kai" ports: - containerPort: {{ ui_port }} protocol: TCP diff --git a/roles/tackle/templates/kai/kai-api-service.yaml.j2 b/roles/tackle/templates/kai/kai-api-service.yaml.j2 index 823779bd..053d5284 100644 --- a/roles/tackle/templates/kai/kai-api-service.yaml.j2 +++ b/roles/tackle/templates/kai/kai-api-service.yaml.j2 @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: - name: kai-api + name: "{{ kai_component_name }}" namespace: "{{ app_namespace }}" spec: selector: