From 663ce646e7fc3291a170253dbc43719a64341c7f Mon Sep 17 00:00:00 2001 From: nspmx Date: Thu, 4 Jan 2024 18:11:14 -0300 Subject: [PATCH 01/20] delete old workflow on main --- .../workflows/google-registry-gke-prod.yml | 139 ------------------ 1 file changed, 139 deletions(-) delete mode 100644 .github/workflows/google-registry-gke-prod.yml diff --git a/.github/workflows/google-registry-gke-prod.yml b/.github/workflows/google-registry-gke-prod.yml deleted file mode 100644 index b9dc418..0000000 --- a/.github/workflows/google-registry-gke-prod.yml +++ /dev/null @@ -1,139 +0,0 @@ -# This workflow build and push a Docker container to Google Artifact Registry and deploy it on Cloud Run when a manual trigger is done on Github -# -# To configure this workflow: -# -# 1. Ensure the required Google Cloud APIs are enabled in the project: -# -# Cloud Build cloudbuild.googleapis.com -# Artifact Registry artifactregistry.googleapis.com -# -# 2. Create a service account (if you don't have one) with the following fields: -# -# Service Account Name -github-actions -# Service Account ID -github-actions -# -# 3. Ensure the service account have the required IAM permissions granted: -# -# Cloud Build -# roles/cloudbuild.builds.editor (cloud build editor) -# roles/cloudbuild.builds.builder (cloud build service account) -# -# Artifact Registry -# roles/artifactregistry.repoAdmin (artifact registry repository administrator) -# roles/artifactregistry.admin (artifact registry administrator) -# -# Service Account -# roles/iam.serviceAccountUser (act as the Cloud Run runtime service account) -# -# Basic Roles -# roles/viewer (viewer) -# -# NOTE: You should always follow the principle of least privilege when assigning IAM roles -# -# 4. Ensure you have the following GitHub Secrets and Variables: -# -# GitHub Secrets -# GCP_SA_KEY (Google Cloud Project Service Account Key) ref visit https://github.com/Datawheel/company/wiki/Setting-Up-a-Service-Account-for-Workflows#use-the-service-account-on-github-secrets -# -# GitHub Variables -# GCP_PROJECT_ID (Google Cloud Project ID) -# GCP_ARTIFACT_REGISTRY_NAME (Google Cloud Articaft Registry Repository Name) -# GCP_ARTIFACT_REGISTRY_LOCATION (Google Cloud Artifact Registry Reposotiry Location) -# -# 5. Ensure you have the following GitHub Vatiables for each environment that you will set up: -# -# GitHub Variables -# GCP_IMAGE_NAME (Docker Image Name) -# GKE_APP_NAME (Kubernetes Application Name) -# GKE_APP_RELEASE (Kubernetes Application Release Version) -# GKE_APP_NAMESPACE (Kubernetes Application Namespace) -# GKE_CLUSTER (Kubernetes Cluster Name) -# GKE_ZONE (Kubernetes Cluster Location) -# -# Further reading: -# Cloud Run IAM permissions - https://cloud.google.com/run/docs/deploying -# Artifact Registry IAM permissions - https://cloud.google.com/artifact-registry/docs/access-control#roles -# Container Registry vs Artifact Registry - https://cloud.google.com/blog/products/application-development/understanding-artifact-registry-vs-container-registry -# Principle of least privilege - https://cloud.google.com/blog/products/identity-security/dont-get-pwned-practicing-the-principle-of-least-privilege -# Deploy CloudRun Github Actions - https://github.com/google-github-actions/deploy-cloudrun -name: Build an Artifact and Deploy using Helm - -on: - workflow_dispatch: - inputs: - release: - description: 'Production release tag' - required: true - type: string - -env: - GCP_PROJECT_ID: ${{ vars.GCP_PROJECT_ID }} - GCP_ARTIFACT_REGISTRY_NAME: ${{ vars.GCP_ARTIFACT_REGISTRY_NAME }} - GCP_ARTIFACT_REGISTRY_LOCATION: ${{ vars.GCP_ARTIFACT_REGISTRY_LOCATION }} - GCP_IMAGE_NAME: ${{ vars.GCP_IMAGE_NAME }} - GKE_APP_NAME: ${{ vars.GKE_APP_NAME }} - GKE_APP_NAMESPACE: ${{ vars.GKE_APP_NAMESPACE }} - GKE_CLUSTER: ${{ vars.GKE_CLUSTER }} - GKE_ZONE: ${{ vars.GKE_ZONE }} - -jobs: - build: - runs-on: ubuntu-latest - environment: production - steps: - - name: Checkout - uses: actions/checkout@v3 - - # Authentication via credentials json - - name: Google Auth - id: auth - uses: google-github-actions/auth@v0 - with: - project_id: ${{ env.GCP_PROJECT_ID }} - credentials_json: ${{ secrets.GCP_SA_KEY }} - - # Build image on Google Cloud Artifact Registry - - name: Build Docker Image - run: |- - gcloud builds submit \ - --quiet \ - --timeout=30m \ - --config=cloudbuild.yml \ - --substitutions=_GCP_ARTIFACT_REGISTRY_LOCATION=${{ env.GCP_ARTIFACT_REGISTRY_LOCATION }},_GCP_PROJECT_ID=${{ env.GCP_PROJECT_ID }},_GCP_ARTIFACT_REGISTRY_NAME=${{ env.GCP_ARTIFACT_REGISTRY_NAME }},_GCP_IMAGE_NAME=${{ env.GCP_IMAGE_NAME }},_GITHUB_SHA=${{ github.sha }} - - # Uncomment for adding the latest tag to the latest image created - - name: Add 'Latest' Tag to Production Environments - run: |- - gcloud beta artifacts docker tags add \ - --quiet \ - ${{ env.GCP_ARTIFACT_REGISTRY_LOCATION }}-docker.pkg.dev/${{ env.GCP_PROJECT_ID }}/${{ env.GCP_ARTIFACT_REGISTRY_NAME }}/${{ env.GCP_IMAGE_NAME }}:${{ github.sha }} \ - ${{ env.GCP_ARTIFACT_REGISTRY_LOCATION }}-docker.pkg.dev/${{ env.GCP_PROJECT_ID }}/${{ env.GCP_ARTIFACT_REGISTRY_NAME }}/${{ env.GCP_IMAGE_NAME }}:latest - - deploy: - needs: build - runs-on: ubuntu-latest - environment: production - steps: - - name: Checkout - uses: actions/checkout@v3 - - # Authentication via credentials json - - name: Google Auth - id: auth - uses: google-github-actions/auth@v0 - with: - project_id: ${{ env.GCP_PROJECT_ID }} - credentials_json: ${{ secrets.GCP_SA_KEY }} - - # Get google kubernetes engine credentials - - name: Get GKE Credentials - uses: google-github-actions/get-gke-credentials@v0 - with: - cluster_name: ${{ env.GKE_CLUSTER }} - location: ${{ env.GKE_ZONE }} - - # Install Helm chart - - name: Helm install - uses: WyriHaximus/github-action-helm3@v2 - with: - exec: helm upgrade --install --create-namespace --namespace ${{ env.GKE_APP_NAMESPACE }} --set app.environment=${{ env.GKE_APP_NAMESPACE }} --set app.release=${{ inputs.release }} --set image.repository=${{ env.GCP_ARTIFACT_REGISTRY_LOCATION }}-docker.pkg.dev/${{ env.GCP_PROJECT_ID }}/${{ env.GCP_ARTIFACT_REGISTRY_NAME }}/${{ env.GCP_IMAGE_NAME }} --set image.tag=${{ github.sha }} --set nameOverride=${{ env.GKE_APP_NAME }} --set fullnameOverride=${{ env.GKE_APP_NAME }} ${{ env.GKE_APP_NAME }} ./helm --values=./helm/production.yaml \ No newline at end of file From 060265470dfb22711a6bdd62683b5e9e9895f09e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20P=C3=A9rez=20Mundaca?= <53226333+nspmx@users.noreply.github.com> Date: Wed, 17 Jan 2024 19:05:17 -0300 Subject: [PATCH 02/20] #update Update development.yaml From af24046ade35ab04cbb17204c26d98309cb8dda2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20P=C3=A9rez=20Mundaca?= <53226333+nspmx@users.noreply.github.com> Date: Wed, 17 Jan 2024 19:06:36 -0300 Subject: [PATCH 03/20] Update development.yaml --- helm/development.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/development.yaml b/helm/development.yaml index dfbcaae..5209414 100644 --- a/helm/development.yaml +++ b/helm/development.yaml @@ -9,7 +9,7 @@ replicaCount: 1 autoscaling: enabled: true minReplicas: 1 - maxReplicas: 4 + maxReplicas: 3 targetCPUUtilizationPercentage: 80 targetMemoryUtilizationPercentage: 120 From 451a71561323511861ae92c3aad1284734331551 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20P=C3=A9rez=20Mundaca?= <53226333+nspmx@users.noreply.github.com> Date: Thu, 18 Jan 2024 10:10:25 -0300 Subject: [PATCH 04/20] Update development.yaml --- helm/development.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/development.yaml b/helm/development.yaml index 5209414..dfbcaae 100644 --- a/helm/development.yaml +++ b/helm/development.yaml @@ -9,7 +9,7 @@ replicaCount: 1 autoscaling: enabled: true minReplicas: 1 - maxReplicas: 3 + maxReplicas: 4 targetCPUUtilizationPercentage: 80 targetMemoryUtilizationPercentage: 120 From 1d60f502068951fccf7f028e819e8e9dbd08d468 Mon Sep 17 00:00:00 2001 From: hermosillajelmy Date: Thu, 18 Jan 2024 17:55:42 -0300 Subject: [PATCH 05/20] add bls growth industry and occupation --- schema/bls_flat_industry.xml | 8 +++++ schema/bls_growth_industry.xml | 54 ++++++++++++++++++++++++++++++++ schema/bls_growth_occupation.xml | 52 ++++++++++++++++++++++++++++++ schema/bls_occupation_flat.xml | 8 +++++ 4 files changed, 122 insertions(+) create mode 100644 schema/bls_flat_industry.xml create mode 100644 schema/bls_growth_industry.xml create mode 100644 schema/bls_growth_occupation.xml create mode 100644 schema/bls_occupation_flat.xml diff --git a/schema/bls_flat_industry.xml b/schema/bls_flat_industry.xml new file mode 100644 index 0000000..377bcbc --- /dev/null +++ b/schema/bls_flat_industry.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/schema/bls_growth_industry.xml b/schema/bls_growth_industry.xml new file mode 100644 index 0000000..1ae7a78 --- /dev/null +++ b/schema/bls_growth_industry.xml @@ -0,0 +1,54 @@ + + + Bureau of Labor Statistics + The Bureau of Labor Statistics (BLS) of the U.S. Department of Labor is the principal federal agency responsible for measuring labor market activity, working conditions, and price changes in the economy. + BLS Statistics by Industry, Growth + https://www.bls.gov/bls/industry.htm + Economy + Industry + +
+ + + TIME + + + + + + + + + NONE + SUM + Jobs + + + + NONE + SUM + Jobs + + + + NONE + CARC + Rate + Compound Annual Rate of Change + + + + NONE + SUM + USD + Billions of Chained 2009 Dollars + + + + NONE + CARC + Rate + Compound Annual Rate of Change + + + \ No newline at end of file diff --git a/schema/bls_growth_occupation.xml b/schema/bls_growth_occupation.xml new file mode 100644 index 0000000..4a541a3 --- /dev/null +++ b/schema/bls_growth_occupation.xml @@ -0,0 +1,52 @@ + + + Bureau of Labor Statistics + The Bureau of Labor Statistics (BLS) of the U.S. Department of Labor is the principal federal agency responsible for measuring labor market activity, working conditions, and price changes in the economy. + BLS Statistics by Occupation, Growth + https://www.bls.gov/bls/occupation.htm + Economy + Occupation + +
+ + + TIME + + + + + + + + + NONE + SUM + Employment + + + + NONE + Percent + Percent + + + + NONE + Change + Employment + + + + NONE + Change Percent + Percent + + + + NONE + SUM + Openings + Projected Occupation Openings + + + \ No newline at end of file diff --git a/schema/bls_occupation_flat.xml b/schema/bls_occupation_flat.xml new file mode 100644 index 0000000..263d779 --- /dev/null +++ b/schema/bls_occupation_flat.xml @@ -0,0 +1,8 @@ + + + +
+ + + + \ No newline at end of file From 18b43d580141e194c270b3d4788b8b4334914cb1 Mon Sep 17 00:00:00 2001 From: hermosillajelmy Date: Mon, 22 Jan 2024 16:31:57 -0300 Subject: [PATCH 06/20] add bls_ces cube --- schema/bls_ces.xml | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 schema/bls_ces.xml diff --git a/schema/bls_ces.xml b/schema/bls_ces.xml new file mode 100644 index 0000000..0e28b3e --- /dev/null +++ b/schema/bls_ces.xml @@ -0,0 +1,37 @@ + + + Bureau of Labor Statistics + The Bureau of Labor Statistics (BLS) of the U.S. Department of Labor is the principal federal agency responsible for measuring labor market activity, working conditions, and price changes in the economy. + Current Employment Statistics + https://www.bls.gov/ces/ + Economy + Industry + +
+ + + TIME + + + + + + + + + NONE + AVG + USD + + + NONE + AVG + Hours + + + NONE + SUM + Employees + + + \ No newline at end of file From 5e0d2a3c764018f7a32306212da98b729a0db5aa Mon Sep 17 00:00:00 2001 From: hermosillajelmy Date: Tue, 23 Jan 2024 12:20:51 -0300 Subject: [PATCH 07/20] add use_spending cube --- schema/bls_ces.xml | 2 +- schema/bls_growth_industry.xml | 2 +- schema/bls_growth_occupation.xml | 2 +- schema/usa_spending.xml | 102 +++++++++++++++++++++++++++++++ 4 files changed, 105 insertions(+), 3 deletions(-) create mode 100644 schema/usa_spending.xml diff --git a/schema/bls_ces.xml b/schema/bls_ces.xml index 0e28b3e..ad1f50e 100644 --- a/schema/bls_ces.xml +++ b/schema/bls_ces.xml @@ -11,7 +11,7 @@ TIME - + diff --git a/schema/bls_growth_industry.xml b/schema/bls_growth_industry.xml index 1ae7a78..63df256 100644 --- a/schema/bls_growth_industry.xml +++ b/schema/bls_growth_industry.xml @@ -11,7 +11,7 @@ TIME - + diff --git a/schema/bls_growth_occupation.xml b/schema/bls_growth_occupation.xml index 4a541a3..4d33bc9 100644 --- a/schema/bls_growth_occupation.xml +++ b/schema/bls_growth_occupation.xml @@ -11,7 +11,7 @@ TIME - + diff --git a/schema/usa_spending.xml b/schema/usa_spending.xml new file mode 100644 index 0000000..32f9f8b --- /dev/null +++ b/schema/usa_spending.xml @@ -0,0 +1,102 @@ + + + USAspending.gov + https://www.usaspending.gov/ + Award Data Archive + https://www.usaspending.gov/ + Economy + Government Spending + USA Spending provides a big-picture view of the federal spending landscape. + +
+ + + +
+ + + + +
+ + + + + + + TIME + + +
+ + + + + + + + + + + + + + + + + + ("transaction_type_id", "transaction_type", "transaction_type_parent") + (0, "Contract", "Contract") + (2, "Block grant", "Grant") + (3, "Formula grant", "Grant") + (4, "Project grant", "Grant") + (5, "Cooperative agreement", "Grant") + (6, "Direct payment for specified use, as a subsidy or other non-reimbursable direct financial aid", "Direct payments") + (7, "Direct loan", "Loans") + (8, "Guaranteed/insured loan", "Loans") + (9, "Insurance", "Other") + (10, "Direct payment with unrestricted use (retirement, pension, veterans benefits, etc.)", "Direct payments") + (11, "Other reimbursable, contingent, intangible, or indirect financial assistance", "Other") + + + + + + + + + +
+ + + + + + + PSC + + +
+ + + + + + + NAPCS + +
+ + + + + + + + USD + + + USD + + + \ No newline at end of file From b713e5f172b954eab7f8cde157c6bce0c13cb3f8 Mon Sep 17 00:00:00 2001 From: hermosillajelmy Date: Tue, 23 Jan 2024 13:50:15 -0300 Subject: [PATCH 08/20] add health cubes --- pyproject.toml | 4 +- requirements.txt | 88 +++++----- ...oken_at_home_by_english_ability_2016_1.xml | 165 ------------------ ...es_of_chronically_homeless_individuals.xml | 33 ++++ schema/health_opioid_overdose_deathrate.xml | 42 +++++ 5 files changed, 123 insertions(+), 209 deletions(-) delete mode 100644 schema/acs_ygl_language_spoken_at_home_by_english_ability_2016_1.xml create mode 100644 schema/health_estimates_of_chronically_homeless_individuals.xml create mode 100644 schema/health_opioid_overdose_deathrate.xml diff --git a/pyproject.toml b/pyproject.toml index a37b498..7059cfd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,10 +6,10 @@ authors = ["Francisco Abarzua "] license = "MIT" [tool.poetry.dependencies] -python = "^3.7" +python = "^3.8" logiclayer = "^0.2.1" logiclayer-complexity = "^0.2.1" -tesseract-olap = {extras = ["clickhouse"], version = "^0.7.0"} +tesseract-olap = {extras = ["clickhouse"], version = "^0.8.2"} uvicorn = {extras = ["standard"], version = "^0.18.0"} [tool.poetry.dev-dependencies] diff --git a/requirements.txt b/requirements.txt index caec3f3..4d80515 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,42 +1,46 @@ -anyio==3.7.0 -asynch==0.2.2 -asyncio==3.4.3 -backports-zoneinfo==0.2.1 -certifi==2023.5.7 -ciso8601==2.3.0 -click==8.1.3 -clickhouse-cityhash==1.0.2.4 -economic-complexity==0.1.3 -exceptiongroup==1.1.1 -fastapi==0.95.2 -h11==0.14.0 -httpcore==0.17.2 -httptools==0.5.0 -httpx==0.24.1 -idna==3.4 -immutables==0.19 -leb128==1.0.5 -logiclayer==0.2.1 -logiclayer-complexity==0.2.1 -lxml==4.9.2 -lz4==4.3.2 -numpy==1.24.3 -orjson==3.9.0 -pandas==1.5.3 -pydantic==1.10.8 -pypika==0.48.9 -python-dateutil==2.8.2 -python-dotenv==1.0.0 -pytz==2023.3 -pyyaml==6.0 -six==1.16.0 -sniffio==1.3.0 -starlette==0.27.0 -tesseract-olap==0.7.2 -typing-extensions==4.6.3 -tzlocal==5.0.1 -uvicorn==0.22.0 -uvloop==0.17.0 -watchfiles==0.19.0 -websockets==11.0.3 -zstd==1.5.5.1 +annotated-types==0.6.0 ; python_version >= "3.8" and python_version < "4.0" +anyio==4.2.0 ; python_version >= "3.8" and python_version < "4.0" +asynch==0.2.3 ; python_version >= "3.8" and python_version < "4.0" +asyncio==3.4.3 ; python_version >= "3.8" and python_version < "4.0" +backports-zoneinfo==0.2.1 ; python_version >= "3.8" and python_version < "3.9" +certifi==2023.11.17 ; python_version >= "3.8" and python_version < "4.0" +ciso8601==2.3.1 ; python_version >= "3.8" and python_version < "4.0" +click==8.1.7 ; python_version >= "3.8" and python_version < "4.0" +colorama==0.4.6 ; python_version >= "3.8" and python_version < "4.0" and sys_platform == "win32" or python_version >= "3.8" and python_version < "4.0" and platform_system == "Windows" +economic-complexity==0.1.4 ; python_version >= "3.8" and python_version < "4.0" +exceptiongroup==1.2.0 ; python_version >= "3.8" and python_version < "3.11" +fastapi==0.109.0 ; python_version >= "3.8" and python_version < "4.0" +h11==0.14.0 ; python_version >= "3.8" and python_version < "4.0" +httpcore==1.0.2 ; python_version >= "3.8" and python_version < "4.0" +httptools==0.6.1 ; python_version >= "3.8" and python_version < "4.0" +httpx==0.26.0 ; python_version >= "3.8" and python_version < "4.0" +idna==3.6 ; python_version >= "3.8" and python_version < "4.0" +immutables==0.20 ; python_version >= "3.8" and python_version < "4.0" +leb128==1.0.5 ; python_version >= "3.8" and python_version < "4.0" +logiclayer-complexity==0.2.1 ; python_version >= "3.8" and python_version < "4.0" +logiclayer==0.2.1 ; python_version >= "3.8" and python_version < "4.0" +lxml==4.9.4 ; python_version >= "3.8" and python_version < "4.0" +lz4==4.3.3 ; python_version >= "3.8" and python_version < "4.0" +numpy==1.24.4 ; python_version >= "3.8" and python_version < "4.0" +orjson==3.9.12 ; python_version >= "3.8" and python_version < "4.0" +pandas==1.5.3 ; python_version >= "3.8" and python_version < "4.0" +pydantic-core==2.14.6 ; python_version >= "3.8" and python_version < "4.0" +pydantic==2.5.3 ; python_version >= "3.8" and python_version < "4.0" +pypika==0.48.9 ; python_version >= "3.8" and python_version < "4.0" +python-dateutil==2.8.2 ; python_version >= "3.8" and python_version < "4.0" +python-dotenv==1.0.1 ; python_version >= "3.8" and python_version < "4.0" +pytz==2023.3.post1 ; python_version >= "3.8" and python_version < "4.0" +pyyaml==6.0.1 ; python_version >= "3.8" and python_version < "4.0" +six==1.16.0 ; python_version >= "3.8" and python_version < "4.0" +sniffio==1.3.0 ; python_version >= "3.8" and python_version < "4.0" +starlette==0.35.1 ; python_version >= "3.8" and python_version < "4.0" +tesseract-olap==0.8.2 ; python_version >= "3.8" and python_version < "4.0" +tesseract-olap[clickhouse]==0.8.2 ; python_version >= "3.8" and python_version < "4.0" +typing-extensions==4.9.0 ; python_version >= "3.8" and python_version < "4.0" +tzdata==2023.4 ; python_version >= "3.8" and python_version < "4.0" and platform_system == "Windows" +tzlocal==5.2 ; python_version >= "3.8" and python_version < "4.0" +uvicorn[standard]==0.18.3 ; python_version >= "3.8" and python_version < "4.0" +uvloop==0.19.0 ; sys_platform != "win32" and sys_platform != "cygwin" and platform_python_implementation != "PyPy" and python_version >= "3.8" and python_version < "4.0" +watchfiles==0.21.0 ; python_version >= "3.8" and python_version < "4.0" +websockets==12.0 ; python_version >= "3.8" and python_version < "4.0" +zstd==1.5.5.1 ; python_version >= "3.8" and python_version < "4.0" diff --git a/schema/acs_ygl_language_spoken_at_home_by_english_ability_2016_1.xml b/schema/acs_ygl_language_spoken_at_home_by_english_ability_2016_1.xml deleted file mode 100644 index 937e0eb..0000000 --- a/schema/acs_ygl_language_spoken_at_home_by_english_ability_2016_1.xml +++ /dev/null @@ -1,165 +0,0 @@ - - - Census Bureau - The American Community Survey (ACS) is conducted by the US Census and sent to a portion of the population every year. - ACS 1-year Estimate - http://www.census.gov/programs-surveys/acs/ - B16001 - - -
- - - -
- - - - -
- - - - - - -
- - - - - - -
- - - - - -
- - - - - -
- - - - - - - - - - - - - - - - - - - ("member_0_code", "member_0") - (0, "Speak Only English") - (1, "Spanish") - (2, "French (Incl. Cajun)") - (3, "Haitian") - (4, "Italian") - (5, "Portuguese") - (6, "German") - (7, "Yiddish, Pennsylvania Dutch or Other West Germanic Languages") - (8, "Greek") - (9, "Russian") - (10, "Polish") - (11, "Serbo-Croatian") - (12, "Ukrainian or Other Slavic Languages") - (13, "Armenian") - (14, "Persian (Incl. Farsi, Dari)") - (15, "Gujarati") - (16, "Hindi") - (17, "Urdu") - (18, "Punjabi") - (19, "Bengali") - (20, "Nepali, Marathi, or Other Indic Languages") - (21, "Other Indo-European Languages") - (22, "Telugu") - (23, "Tamil") - (24, "Malayalam, Kannada, or Other Dravidian Languages") - (25, "Chinese (Incl. Mandarin, Cantonese)") - (26, "Japanese") - (27, "Korean") - (28, "Hmong") - (29, "Vietnamese") - (30, "Khmer") - (31, "Thai, Lao, or Other Tai-Kadai Languages") - (32, "Other Languages of Asia") - (33, "Tagalog (Incl. Filipino)") - (34, "Ilocano, Samoan, Hawaiian, or Other Austronesian Languages") - (35, "Arabic") - (36, "Hebrew") - (37, "Amharic, Somali, or Other Afro-Asiatic Languages") - (38, "Yoruba, Twi, Igbo, or Other Languages of Western Africa") - (39, "Swahili or Other Languages of Central, Eastern, & Southern Africa") - (40, "Navajo") - (41, "Other Native Languages of North America") - (42, "Other & Unspecified Languages") - - - - - - - - - - ("member_0_code", "member_0") - (0,"Speak English"very Well"") - (1,"Speak English Less Than"very Well"") - - - - - - - SUM - People - - - \ No newline at end of file diff --git a/schema/health_estimates_of_chronically_homeless_individuals.xml b/schema/health_estimates_of_chronically_homeless_individuals.xml new file mode 100644 index 0000000..76f8586 --- /dev/null +++ b/schema/health_estimates_of_chronically_homeless_individuals.xml @@ -0,0 +1,33 @@ + + + Department of Housing and Urban Development (HUD) + Part 1 of the Annual Homeless Assessment Report to Congress (AHAR) provides Point-inTime (PIT) estimates, offering a snapshot of homelessness—both sheltered and unsheltered— on a single night. The PIT counts also provide an estimate of the number of people experiencing homelessness within particular homeless populations, such as people with chronic patterns of homelessness and veterans experiencing homelessness. + http://hud.gov/ + The 2017 Annual Homeless Assessment Report (AHAR) to Congress, Part 1 + https://www.hudexchange.info/resources/documents/2017-AHAR-Part-1.pdf + Drivers of Health + Health + +
+ + + + + + + + + GEOGRAPHY + + +
+ + + + + + A chronically homeless individual refers to an individual with a disability who has been continuously homeless for one year or more or has experienced at least four episodes of homelessness in the last three years where the combined length of time homeless in those occasions is at least 12 months. + Number + + + \ No newline at end of file diff --git a/schema/health_opioid_overdose_deathrate.xml b/schema/health_opioid_overdose_deathrate.xml new file mode 100644 index 0000000..d998e80 --- /dev/null +++ b/schema/health_opioid_overdose_deathrate.xml @@ -0,0 +1,42 @@ + + + Kaiser Family Foundation + State Health Facts provides free, up-to-date, health data for all 50 states, the District of Columbia, the United States, counties, territories, and other geographies. + https://www.kff.org/ + State Health Facts + https://www.kff.org/other/state-indicator/opioid-overdose-death-rates/?currentTimeframe=0&sortModel=%7B%22colId%22:%22Location%22,%22sort%22:%22asc%22%7D + Behavioral Health Conditions + Health + +
+ + + + + + + + + +
+ + + + +
+ + + + +
+ + + + + + + Among the deaths with drug overdose as the underlying cause, the type of opioid involved is indicated by ICD-10 multiple cause-of-death codes. Age-adjusted death rates were calculated by applying age-specific death rates to the 2000 U.S. standard population age distribution. + People + + + \ No newline at end of file From 8394ecdcde9718261bd0711e3c826fb516970c86 Mon Sep 17 00:00:00 2001 From: hermosillajelmy Date: Wed, 14 Feb 2024 10:59:11 -0300 Subject: [PATCH 09/20] test --- schema/dot_faf.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schema/dot_faf.xml b/schema/dot_faf.xml index 1cfe7c2..42f3f18 100644 --- a/schema/dot_faf.xml +++ b/schema/dot_faf.xml @@ -34,7 +34,7 @@ GEOGRAPHY -
+
From 30c65dce2bbe3ec6ec36a100aa1c320e2edf22bc Mon Sep 17 00:00:00 2001 From: hermosillajelmy Date: Wed, 14 Feb 2024 11:07:24 -0300 Subject: [PATCH 10/20] go back to last commit --- schema/dot_faf.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schema/dot_faf.xml b/schema/dot_faf.xml index 42f3f18..1cfe7c2 100644 --- a/schema/dot_faf.xml +++ b/schema/dot_faf.xml @@ -34,7 +34,7 @@ GEOGRAPHY -
+
From b73ce368be38ba8590f2fbe584b54807c97d0924 Mon Sep 17 00:00:00 2001 From: hermosillajelmy Date: Thu, 15 Feb 2024 10:29:49 -0300 Subject: [PATCH 11/20] update tesseract-python version --- pyproject.toml | 2 +- requirements.txt | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 7059cfd..6995312 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,7 @@ license = "MIT" python = "^3.8" logiclayer = "^0.2.1" logiclayer-complexity = "^0.2.1" -tesseract-olap = {extras = ["clickhouse"], version = "^0.8.2"} +tesseract-olap = {extras = ["clickhouse"], version = "^0.8.3"} uvicorn = {extras = ["standard"], version = "^0.18.0"} [tool.poetry.dev-dependencies] diff --git a/requirements.txt b/requirements.txt index 4d80515..eb5dba4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,15 +3,15 @@ anyio==4.2.0 ; python_version >= "3.8" and python_version < "4.0" asynch==0.2.3 ; python_version >= "3.8" and python_version < "4.0" asyncio==3.4.3 ; python_version >= "3.8" and python_version < "4.0" backports-zoneinfo==0.2.1 ; python_version >= "3.8" and python_version < "3.9" -certifi==2023.11.17 ; python_version >= "3.8" and python_version < "4.0" +certifi==2024.2.2 ; python_version >= "3.8" and python_version < "4.0" ciso8601==2.3.1 ; python_version >= "3.8" and python_version < "4.0" click==8.1.7 ; python_version >= "3.8" and python_version < "4.0" colorama==0.4.6 ; python_version >= "3.8" and python_version < "4.0" and sys_platform == "win32" or python_version >= "3.8" and python_version < "4.0" and platform_system == "Windows" economic-complexity==0.1.4 ; python_version >= "3.8" and python_version < "4.0" exceptiongroup==1.2.0 ; python_version >= "3.8" and python_version < "3.11" -fastapi==0.109.0 ; python_version >= "3.8" and python_version < "4.0" +fastapi==0.109.2 ; python_version >= "3.8" and python_version < "4.0" h11==0.14.0 ; python_version >= "3.8" and python_version < "4.0" -httpcore==1.0.2 ; python_version >= "3.8" and python_version < "4.0" +httpcore==1.0.3 ; python_version >= "3.8" and python_version < "4.0" httptools==0.6.1 ; python_version >= "3.8" and python_version < "4.0" httpx==0.26.0 ; python_version >= "3.8" and python_version < "4.0" idna==3.6 ; python_version >= "3.8" and python_version < "4.0" @@ -22,22 +22,22 @@ logiclayer==0.2.1 ; python_version >= "3.8" and python_version < "4.0" lxml==4.9.4 ; python_version >= "3.8" and python_version < "4.0" lz4==4.3.3 ; python_version >= "3.8" and python_version < "4.0" numpy==1.24.4 ; python_version >= "3.8" and python_version < "4.0" -orjson==3.9.12 ; python_version >= "3.8" and python_version < "4.0" +orjson==3.9.14 ; python_version >= "3.8" and python_version < "4.0" pandas==1.5.3 ; python_version >= "3.8" and python_version < "4.0" -pydantic-core==2.14.6 ; python_version >= "3.8" and python_version < "4.0" -pydantic==2.5.3 ; python_version >= "3.8" and python_version < "4.0" +pydantic-core==2.16.2 ; python_version >= "3.8" and python_version < "4.0" +pydantic==2.6.1 ; python_version >= "3.8" and python_version < "4.0" pypika==0.48.9 ; python_version >= "3.8" and python_version < "4.0" python-dateutil==2.8.2 ; python_version >= "3.8" and python_version < "4.0" python-dotenv==1.0.1 ; python_version >= "3.8" and python_version < "4.0" -pytz==2023.3.post1 ; python_version >= "3.8" and python_version < "4.0" +pytz==2024.1 ; python_version >= "3.8" and python_version < "4.0" pyyaml==6.0.1 ; python_version >= "3.8" and python_version < "4.0" six==1.16.0 ; python_version >= "3.8" and python_version < "4.0" sniffio==1.3.0 ; python_version >= "3.8" and python_version < "4.0" -starlette==0.35.1 ; python_version >= "3.8" and python_version < "4.0" -tesseract-olap==0.8.2 ; python_version >= "3.8" and python_version < "4.0" -tesseract-olap[clickhouse]==0.8.2 ; python_version >= "3.8" and python_version < "4.0" +starlette==0.36.3 ; python_version >= "3.8" and python_version < "4.0" +tesseract-olap==0.8.3 ; python_version >= "3.8" and python_version < "4.0" +tesseract-olap[clickhouse]==0.8.3 ; python_version >= "3.8" and python_version < "4.0" typing-extensions==4.9.0 ; python_version >= "3.8" and python_version < "4.0" -tzdata==2023.4 ; python_version >= "3.8" and python_version < "4.0" and platform_system == "Windows" +tzdata==2024.1 ; python_version >= "3.8" and python_version < "4.0" and platform_system == "Windows" tzlocal==5.2 ; python_version >= "3.8" and python_version < "4.0" uvicorn[standard]==0.18.3 ; python_version >= "3.8" and python_version < "4.0" uvloop==0.19.0 ; sys_platform != "win32" and sys_platform != "cygwin" and platform_python_implementation != "PyPy" and python_version >= "3.8" and python_version < "4.0" From 5ec0936294cc4c007bf2b9eb4e85885525031f9f Mon Sep 17 00:00:00 2001 From: hermosillajelmy Date: Thu, 15 Feb 2024 10:33:52 -0300 Subject: [PATCH 12/20] update tesseract-python version --- schema/onet_by_pums.xml | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/schema/onet_by_pums.xml b/schema/onet_by_pums.xml index 00263e9..a1ab8aa 100644 --- a/schema/onet_by_pums.xml +++ b/schema/onet_by_pums.xml @@ -20,29 +20,23 @@ - - NONE - NONE - Not used for presentation - true - + NONE + NONE + Not used for presentation + true - - NONE - NONE - Not used for presentation - true - + NONE + NONE + Not used for presentation + true - - NONE - NONE - Calculated by IM Value * LV Value - + NONE + NONE + Calculated by IM Value * LV Value \ No newline at end of file From 4ad23f7659f64d3a0cfc0bc755b815e5917c7729 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20P=C3=A9rez=20Mundaca?= <53226333+nspmx@users.noreply.github.com> Date: Mon, 11 Mar 2024 13:18:41 -0300 Subject: [PATCH 13/20] #update development.yaml --- helm/development.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/helm/development.yaml b/helm/development.yaml index dfbcaae..f83a918 100644 --- a/helm/development.yaml +++ b/helm/development.yaml @@ -69,8 +69,9 @@ ingress: 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: "120s" - nginx.org/proxy-read-timeout: "120s" + nginx.org/proxy-connect-timeout: "480s" + nginx.org/proxy-read-timeout: "480s" + nginx.org/proxy_send_timeout: "480s" nginx.org/proxy-buffers: "8 16k" nginx.org/proxy-buffer-size: "16k" nginx.org/proxy-busy-buffers-size: "64k" From ecadd35413d7f2ab9f580a476d3f18a9fbec413a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20P=C3=A9rez=20Mundaca?= <53226333+nspmx@users.noreply.github.com> Date: Mon, 11 Mar 2024 13:29:54 -0300 Subject: [PATCH 14/20] #udate development.yaml --- helm/development.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/development.yaml b/helm/development.yaml index f83a918..65394e3 100644 --- a/helm/development.yaml +++ b/helm/development.yaml @@ -71,7 +71,7 @@ ingress: ingress.kubernetes.io/ssl-redirect: "true" nginx.org/proxy-connect-timeout: "480s" nginx.org/proxy-read-timeout: "480s" - nginx.org/proxy_send_timeout: "480s" + nginx.org/proxy-send-timeout: "480s" nginx.org/proxy-buffers: "8 16k" nginx.org/proxy-buffer-size: "16k" nginx.org/proxy-busy-buffers-size: "64k" From d3963201dbc251668f6740a551678dfdd8ddc02d Mon Sep 17 00:00:00 2001 From: hermosillajelmy Date: Wed, 20 Mar 2024 10:02:57 -0300 Subject: [PATCH 15/20] change state level in bls_supersector --- schema/bls_employment_supersector_only.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schema/bls_employment_supersector_only.xml b/schema/bls_employment_supersector_only.xml index a3fd025..1caf75c 100644 --- a/schema/bls_employment_supersector_only.xml +++ b/schema/bls_employment_supersector_only.xml @@ -19,7 +19,7 @@
- + From dca13665a2f9c024c93707f331c9d017a32b5dc1 Mon Sep 17 00:00:00 2001 From: hermosillajelmy Date: Wed, 20 Mar 2024 10:12:09 -0300 Subject: [PATCH 16/20] fix state level in bls cubes --- schema/bls_employment_industry_only.xml | 6 +++--- schema/bls_employment_supersector_only.xml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/schema/bls_employment_industry_only.xml b/schema/bls_employment_industry_only.xml index 6dd0992..88029af 100644 --- a/schema/bls_employment_industry_only.xml +++ b/schema/bls_employment_industry_only.xml @@ -17,10 +17,10 @@ - - + +
- + diff --git a/schema/bls_employment_supersector_only.xml b/schema/bls_employment_supersector_only.xml index 1caf75c..b95d07f 100644 --- a/schema/bls_employment_supersector_only.xml +++ b/schema/bls_employment_supersector_only.xml @@ -16,8 +16,8 @@ - - + +
From 8325d5792acc4e63c82fae0e59e9e8a41c482e53 Mon Sep 17 00:00:00 2001 From: hermosillajelmy Date: Fri, 22 Mar 2024 12:14:39 -0300 Subject: [PATCH 17/20] update LL complexity --- pyproject.toml | 2 +- requirements.txt | 33 +++++++++++++++++---------------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 6995312..c14ad44 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,7 @@ license = "MIT" [tool.poetry.dependencies] python = "^3.8" logiclayer = "^0.2.1" -logiclayer-complexity = "^0.2.1" +logiclayer-complexity = "^0.4.1" tesseract-olap = {extras = ["clickhouse"], version = "^0.8.3"} uvicorn = {extras = ["standard"], version = "^0.18.0"} diff --git a/requirements.txt b/requirements.txt index eb5dba4..b1eaa0d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ annotated-types==0.6.0 ; python_version >= "3.8" and python_version < "4.0" -anyio==4.2.0 ; python_version >= "3.8" and python_version < "4.0" +anyio==4.3.0 ; python_version >= "3.8" and python_version < "4.0" asynch==0.2.3 ; python_version >= "3.8" and python_version < "4.0" asyncio==3.4.3 ; python_version >= "3.8" and python_version < "4.0" backports-zoneinfo==0.2.1 ; python_version >= "3.8" and python_version < "3.9" @@ -7,37 +7,38 @@ certifi==2024.2.2 ; python_version >= "3.8" and python_version < "4.0" ciso8601==2.3.1 ; python_version >= "3.8" and python_version < "4.0" click==8.1.7 ; python_version >= "3.8" and python_version < "4.0" colorama==0.4.6 ; python_version >= "3.8" and python_version < "4.0" and sys_platform == "win32" or python_version >= "3.8" and python_version < "4.0" and platform_system == "Windows" -economic-complexity==0.1.4 ; python_version >= "3.8" and python_version < "4.0" +economic-complexity==0.2.2 ; python_version >= "3.8" and python_version < "4.0" exceptiongroup==1.2.0 ; python_version >= "3.8" and python_version < "3.11" -fastapi==0.109.2 ; python_version >= "3.8" and python_version < "4.0" +fastapi==0.110.0 ; python_version >= "3.8" and python_version < "4.0" h11==0.14.0 ; python_version >= "3.8" and python_version < "4.0" -httpcore==1.0.3 ; python_version >= "3.8" and python_version < "4.0" +httpcore==1.0.4 ; python_version >= "3.8" and python_version < "4.0" httptools==0.6.1 ; python_version >= "3.8" and python_version < "4.0" -httpx==0.26.0 ; python_version >= "3.8" and python_version < "4.0" +httpx==0.27.0 ; python_version >= "3.8" and python_version < "4.0" idna==3.6 ; python_version >= "3.8" and python_version < "4.0" immutables==0.20 ; python_version >= "3.8" and python_version < "4.0" -leb128==1.0.5 ; python_version >= "3.8" and python_version < "4.0" -logiclayer-complexity==0.2.1 ; python_version >= "3.8" and python_version < "4.0" +leb128==1.0.7 ; python_version >= "3.8" and python_version < "4.0" +logiclayer-complexity==0.4.1 ; python_version >= "3.8" and python_version < "4.0" logiclayer==0.2.1 ; python_version >= "3.8" and python_version < "4.0" lxml==4.9.4 ; python_version >= "3.8" and python_version < "4.0" lz4==4.3.3 ; python_version >= "3.8" and python_version < "4.0" -numpy==1.24.4 ; python_version >= "3.8" and python_version < "4.0" -orjson==3.9.14 ; python_version >= "3.8" and python_version < "4.0" -pandas==1.5.3 ; python_version >= "3.8" and python_version < "4.0" -pydantic-core==2.16.2 ; python_version >= "3.8" and python_version < "4.0" -pydantic==2.6.1 ; python_version >= "3.8" and python_version < "4.0" +numpy==1.24.4 ; python_version >= "3.8" and python_version < "3.9" +numpy==1.26.4 ; python_version >= "3.9" and python_version < "4.0" +orjson==3.9.15 ; python_version >= "3.8" and python_version < "4.0" +pandas==2.0.3 ; python_version >= "3.8" and python_version < "4.0" +pydantic-core==2.16.3 ; python_version >= "3.8" and python_version < "4.0" +pydantic==2.6.4 ; python_version >= "3.8" and python_version < "4.0" pypika==0.48.9 ; python_version >= "3.8" and python_version < "4.0" -python-dateutil==2.8.2 ; python_version >= "3.8" and python_version < "4.0" +python-dateutil==2.9.0.post0 ; python_version >= "3.8" and python_version < "4.0" python-dotenv==1.0.1 ; python_version >= "3.8" and python_version < "4.0" pytz==2024.1 ; python_version >= "3.8" and python_version < "4.0" pyyaml==6.0.1 ; python_version >= "3.8" and python_version < "4.0" six==1.16.0 ; python_version >= "3.8" and python_version < "4.0" -sniffio==1.3.0 ; python_version >= "3.8" and python_version < "4.0" +sniffio==1.3.1 ; python_version >= "3.8" and python_version < "4.0" starlette==0.36.3 ; python_version >= "3.8" and python_version < "4.0" tesseract-olap==0.8.3 ; python_version >= "3.8" and python_version < "4.0" tesseract-olap[clickhouse]==0.8.3 ; python_version >= "3.8" and python_version < "4.0" -typing-extensions==4.9.0 ; python_version >= "3.8" and python_version < "4.0" -tzdata==2024.1 ; python_version >= "3.8" and python_version < "4.0" and platform_system == "Windows" +typing-extensions==4.10.0 ; python_version >= "3.8" and python_version < "4.0" +tzdata==2024.1 ; python_version >= "3.8" and python_version < "4.0" tzlocal==5.2 ; python_version >= "3.8" and python_version < "4.0" uvicorn[standard]==0.18.3 ; python_version >= "3.8" and python_version < "4.0" uvloop==0.19.0 ; sys_platform != "win32" and sys_platform != "cygwin" and platform_python_implementation != "PyPy" and python_version >= "3.8" and python_version < "4.0" From a547a93afb1768483248a505c7757cc64284d186 Mon Sep 17 00:00:00 2001 From: hermosillajelmy Date: Fri, 22 Mar 2024 12:20:58 -0300 Subject: [PATCH 18/20] restart --- schema/usa_spending.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/schema/usa_spending.xml b/schema/usa_spending.xml index 32f9f8b..2e6e539 100644 --- a/schema/usa_spending.xml +++ b/schema/usa_spending.xml @@ -99,4 +99,5 @@ USD + \ No newline at end of file From 5bad61e1e89e60d503ab3f9b3bd4142f33cbd11d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmy=20Hermosilla=20Rodr=C3=ADguez?= <59574973+hermosillajelmy@users.noreply.github.com> Date: Fri, 5 Apr 2024 13:41:32 -0300 Subject: [PATCH 19/20] Update bls_flat_industry.xml --- schema/bls_flat_industry.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/schema/bls_flat_industry.xml b/schema/bls_flat_industry.xml index 377bcbc..4148416 100644 --- a/schema/bls_flat_industry.xml +++ b/schema/bls_flat_industry.xml @@ -2,7 +2,7 @@
- + - \ No newline at end of file + From 1d22b93e14f6ced6690ce2eb7669ce9aa884eeb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20P=C3=A9rez=20Mundaca?= <53226333+nspmx@users.noreply.github.com> Date: Thu, 11 Apr 2024 12:20:25 -0400 Subject: [PATCH 20/20] change helm template to use custom nginx hosts --- helm/production.yaml | 10 +++++---- helm/templates/ingress.yaml | 45 +++++++++++++++++++++++++------------ 2 files changed, 37 insertions(+), 18 deletions(-) diff --git a/helm/production.yaml b/helm/production.yaml index fdda1a8..cf0c399 100644 --- a/helm/production.yaml +++ b/helm/production.yaml @@ -76,11 +76,13 @@ ingress: nginx.org/proxy-busy-buffers-size: "64k" nginx.org/location-snippets: | add_header Access-Control-Allow-Origin *; - hosts: - - host: api-prod.datausa.io + customHosts: + - host: api-varnish.datausa.io paths: - - / + - path: / + service: varnish-tesseract-api + port: 8080 tls: - secretName: tesseract-api-ingress-tls hosts: - - api-prod.datausa.io + - api-varnish.datausa.io diff --git a/helm/templates/ingress.yaml b/helm/templates/ingress.yaml index ff77c6a..84cf5e6 100644 --- a/helm/templates/ingress.yaml +++ b/helm/templates/ingress.yaml @@ -26,18 +26,35 @@ spec: {{- end }} {{- end }} rules: - {{- range .Values.ingress.hosts }} - - host: {{ .host | quote }} - http: - paths: - {{- range .paths }} - - path: {{ . }} - pathType: Prefix - backend: - service: - name: {{ $fullName }} - port: - number: {{ $servicePort }} - {{- end }} - {{- end }} + {{ if .Values.ingress.customHosts }} + {{- range .Values.ingress.customHosts }} + - host: {{ .host | quote }} + http: + paths: + {{- range .paths }} + - path: {{ .path }} + pathType: Prefix + backend: + service: + name: {{ .service }} + port: + number: {{ .port }} + {{- end }} + {{- end }} + {{ else }} + {{- range .Values.ingress.hosts }} + - host: {{ .host | quote }} + http: + paths: + {{- range .paths }} + - path: {{ . }} + pathType: Prefix + backend: + service: + name: {{ $fullName }} + port: + number: {{ $servicePort }} + {{- end }} + {{- end }} + {{ end }} {{- end }}