Merge pull request #26 from DataUSA/develop

Delaware Deployment
DataUSA · Oct 23, 2024 · 11ab5ab · 11ab5ab
2 parents a7c5ae3 + d06956f
commit 11ab5ab
Show file tree

Hide file tree

Showing 20 changed files with 890 additions and 148 deletions.
diff --git a/app.py b/app.py
diff --git a/build-explorer/index.html b/build-explorer/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-<title>OEC Tesseract Python Demo</title>
+<title>DataUSA Tesseract Python</title>
 <meta charset="utf-8" />
 <meta name="viewport" content="width=device-width,initial-scale=1" />
 <link rel="icon" href="data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQEAYAAABPYyMiAAAABmJLR0T///////8JWPfcAAAACXBIWXMAAABIAAAASABGyWs+AAAAF0lEQVRIx2NgGAWjYBSMglEwCkbBSAcACBAAAeaR9cIAAAAASUVORK5CYII=" type="image/x-icon" />

diff --git a/explorer/index.html b/explorer/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-<title>OEC Tesseract Python Demo</title>
+<title>DataUSA Tesseract Python</title>
 <meta charset="utf-8" />
 <meta name="viewport" content="width=device-width,initial-scale=1" />
 <link rel="icon" href="data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQEAYAAABPYyMiAAAABmJLR0T///////8JWPfcAAAACXBIWXMAAABIAAAASABGyWs+AAAAF0lEQVRIx2NgGAWjYBSMglEwCkbBSAcACBAAAeaR9cIAAAAASUVORK5CYII=" type="image/x-icon" />

diff --git a/helm/delaware.yaml b/helm/delaware.yaml
@@ -0,0 +1,90 @@
+image:
+  pullPolicy: Always
+
+imagePullSecrets:
+  - name: github
+
+replicaCount: 1
+
+autoscaling:
+  enabled: false
+  minReplicas: 1
+  maxReplicas: 4
+  targetCPUUtilizationPercentage: 80
+  targetMemoryUtilizationPercentage: 120
+
+resources: {}
+# resources:
+#   requests:
+#     cpu: 500m
+#     memory: 2Gi
+#   limits:
+#     cpu: 1000m
+#     memory: 8Gi
+
+livenessProbe:
+  failureThreshold: 3
+  httpGet:
+    path: /
+    port: 7777
+    scheme: HTTP
+  initialDelaySeconds: 30
+  periodSeconds: 30
+  timeoutSeconds: 30
+  successThreshold: 1
+
+readinessProbe:
+  failureThreshold: 3
+  httpGet:
+    path: /
+    port: 7777
+    scheme: HTTP
+  initialDelaySeconds: 30
+  periodSeconds: 30
+  timeoutSeconds: 30
+  successThreshold: 2
+
+service:
+  type: ClusterIP
+  port: 7777
+
+serviceAccount:
+  # Specifies whether a service account should be created
+  create: true
+  # Annotations to add to the service account
+  annotations: {}
+  # The name of the service account to use.
+  # If not set and create is true, a name is generated using the fullname template
+  name: ""
+
+configMap:
+  TESSERACT_DEBUG: "true"
+  TESSERACT_SCHEMA: "schema"
+
+# secrets:
+#   TESSERACT_BACKEND: <BASE64_VALUE>
+
+ingress:
+  enabled: true
+  annotations:
+    cert-manager.io/cluster-issuer: "letsencrypt-prod"
+    acme.cert-manager.io/http01-edit-in-place: "true"
+    ingress.kubernetes.io/ssl-redirect: "true"
+    nginx.org/proxy-connect-timeout: "480s"
+    nginx.org/proxy-read-timeout: "480s"
+    nginx.org/proxy-buffers: "8 16k"
+    nginx.org/proxy-buffer-size: "16k"
+    nginx.org/proxy-busy-buffers-size: "64k"
+    nginx.org/location-snippets: |
+      add_header Access-Control-Allow-Origin *;
+  className: nginx
+  customHosts:
+    - host: delaware-api-ts.datausa.io
+      paths:
+        - path: /
+          service: tesseract-api-delaware
+          port: 7777
+  tls:
+    - secretName: tesseract-api-delaware-ingress-tls
+      hosts: 
+        - delaware-api-ts.datausa.io
diff --git a/helm/development.yaml b/helm/development.yaml
@@ -7,19 +7,20 @@ imagePullSecrets:
 replicaCount: 1
 
 autoscaling:
-  enabled: true
+  enabled: false
   minReplicas: 1
   maxReplicas: 4
   targetCPUUtilizationPercentage: 80
   targetMemoryUtilizationPercentage: 120
 
-resources:
-  requests:
-    cpu: 10m
-    memory: 256Mi
-  limits:
-    cpu: 200m
-    memory: 1Gi
+resources: {}
+# resources:
+#   requests:
+#     cpu: 10m
+#     memory: 256Mi
+#   limits:
+#     cpu: 200m
+#     memory: 1Gi
 
 livenessProbe:
   failureThreshold: 3

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -13,8 +13,8 @@ packages = [{include = "app"}]
 python = "^3.8"
 granian = "^1.4.0"
 logiclayer = "^0.4.0"
-logiclayer-complexity = "^0.5.4"
-tesseract-olap = {extras = ["clickhouse", "redis"], version = "^0.9.9"}
+logiclayer-complexity = "^0.6.2"
+tesseract-olap = {extras = ["clickhouse", "redis"], version = "^0.11.0"}
 
 [tool.poetry.group.dev.dependencies]
 granian = {extras = ["reload"], version = "^1.4.0"}