add table extraction taskrunner

DARPA-ASKEM · Sep 26, 2024 · 88769f9 · 88769f9
1 parent 89b2ef1
commit 88769f9
Show file tree

Hide file tree

Showing 9 changed files with 91 additions and 2 deletions.
diff --git a/kubernetes/base/services/table-extraction-taskrunner/kustomization.yaml b/kubernetes/base/services/table-extraction-taskrunner/kustomization.yaml
@@ -0,0 +1,6 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: terarium
+resources:
+  - table-extraction-taskrunner-deployment.yaml
diff --git a/...tes/base/services/table-extraction-taskrunner/table-extraction-taskrunner-deployment.yaml b/...tes/base/services/table-extraction-taskrunner/table-extraction-taskrunner-deployment.yaml
@@ -0,0 +1,31 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: table-extraction-taskrunner
+  labels:
+    software.uncharted.terarium/name: table-extraction-taskrunner
+    software.uncharted.terarium/component: taskrunner
+    software.uncharted.terarium/service: table-extraction
+    software.uncharted.terarium/part-of: services
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      software.uncharted.terarium/name: table-extraction-taskrunner
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      labels:
+        software.uncharted.terarium/name: table-extraction-taskrunner
+    spec:
+      containers:
+        - name: table-extraction-taskrunner
+          image: table-extraction-taskrunner-image
+          imagePullPolicy: Always
+          resources: {}
+      imagePullSecrets:
+        - name: ghcr-cred
+      restartPolicy: Always
+status: {}
diff --git a/kubernetes/overlays/prod/base/kustomization.yaml b/kubernetes/overlays/prod/base/kustomization.yaml
@@ -46,6 +46,7 @@ patches:
   - path: services/skema/skema-memgraph-deployment.yaml
   - path: services/skema/skema-rs-deployment.yaml
   - path: services/skema/skema-unified-deployment.yaml
+  - path: services/table-extraction-taskrunner/table-extraction-taskrunner-deployment.yaml
   - path: services/text-extraction-taskrunner/text-extraction-taskrunner-deployment.yaml
 
 configMapGenerator:

diff --git a/...se/services/equation-extraction-taskrunner/equation-extraction-taskrunner-deployment.yaml b/...se/services/equation-extraction-taskrunner/equation-extraction-taskrunner-deployment.yaml
@@ -28,4 +28,4 @@ spec:
                   name: mq-creds
                   key: password
             - name: TERARIUM_TASKRUNNER_REQUEST-TYPE
-              value: 'equation-extraction'
+              value: 'equation_extraction'
diff --git a/...rod/base/services/table-extraction-taskrunner/table-extraction-taskrunner-deployment.yaml b/...rod/base/services/table-extraction-taskrunner/table-extraction-taskrunner-deployment.yaml
@@ -0,0 +1,36 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: table-extraction-taskrunner
+spec:
+  strategy:
+    type: RollingUpdate
+  template:
+    spec:
+      containers:
+        - name: table-extraction-taskrunner
+          imagePullPolicy: Always
+          env:
+            - name: ASKEM_DOC_AI_API_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: chat-gpt-secrets
+                  key: chatgptkey
+            - name: SPRING_RABBITMQ_ADDRESSES
+              valueFrom:
+                secretKeyRef:
+                  name: mq-creds
+                  key: address
+            - name: TERARIUM_MQ-USERNAME
+              valueFrom:
+                secretKeyRef:
+                  name: mq-creds
+                  key: username
+            - name: TERARIUM_MQ-PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: mq-creds
+                  key: password
+            - name: TERARIUM_TASKRUNNER_REQUEST-TYPE
+              value: 'table_extraction'
diff --git a/.../prod/base/services/text-extraction-taskrunner/text-extraction-taskrunner-deployment.yaml b/.../prod/base/services/text-extraction-taskrunner/text-extraction-taskrunner-deployment.yaml
@@ -28,4 +28,4 @@ spec:
                   name: mq-creds
                   key: password
             - name: TERARIUM_TASKRUNNER_REQUEST-TYPE
-              value: 'text-extraction'
+              value: 'text_extraction'
diff --git a/kubernetes/overlays/prod/overlays/askem-dev/kustomization.yaml b/kubernetes/overlays/prod/overlays/askem-dev/kustomization.yaml
@@ -118,6 +118,11 @@ images:
     newName: ghcr.io/darpa-askem/text-extraction-taskrunner
     newTag: 'latest'
 
+  # Table extraction (CPU)
+  - name: table-extraction-taskrunner-image
+    newName: ghcr.io/darpa-askem/table-extraction-taskrunner
+    newTag: 'latest'
+
   # climate data
   - name: climate-data-image
     newName: ghcr.io/darpa-askem/climate-data-service

diff --git a/kubernetes/overlays/prod/overlays/askem-production/kustomization.yaml b/kubernetes/overlays/prod/overlays/askem-production/kustomization.yaml
@@ -95,6 +95,11 @@ images:
     newName: ghcr.io/darpa-askem/text-extraction-taskrunner
     newTag: '2.21.3'
 
+  # Table extraction (CPU)
+  - name: table-extraction-taskrunner-image
+    newName: ghcr.io/darpa-askem/table-extraction-taskrunner
+    newTag: 'latest'
+
   # Integration Dashboard
   - name: integration-dashboard-image
     newName: ghcr.io/darpa-askem/integration-dashboard

diff --git a/kubernetes/overlays/prod/overlays/askem-staging/kustomization.yaml b/kubernetes/overlays/prod/overlays/askem-staging/kustomization.yaml
@@ -103,6 +103,11 @@ images:
     newName: ghcr.io/darpa-askem/text-extraction-taskrunner
     newTag: 'latest'
 
+  # Table extraction (CPU)
+  - name: table-extraction-taskrunner-image
+    newName: ghcr.io/darpa-askem/table-extraction-taskrunner
+    newTag: 'latest'
+
   # climate data
   - name: climate-data-image
     newName: ghcr.io/darpa-askem/climate-data-service