From 4eaf7648e1d68a1e2823b19993f8a3103a82bba7 Mon Sep 17 00:00:00 2001
From: sydneynotthecity <sydney@stellar.org>
Date: Thu, 18 Apr 2024 08:35:03 -0500
Subject: [PATCH] Update prod config and ci

---
 .github/workflows/release.yml | 10 ++--
 airflow_variables_prod.json   | 94 ++---------------------------------
 2 files changed, 9 insertions(+), 95 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1ba61839..f089d9db 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -39,8 +39,8 @@ jobs:
       - id: "get-credentials"
         uses: "google-github-actions/get-gke-credentials@v2"
         with:
-          cluster_name: "us-central1-hubble-1pt5-dev-7db0e004-gke"
-          location: "us-central1-c"
+          cluster_name: "us-central1-hubble-14c4ca64-gke"
+          location: "us-central1"
 
       - name: Pytest
         run: pytest dags/
@@ -75,17 +75,17 @@ jobs:
         run: python dags/stellar_etl_airflow/add_files_to_composer.py --bucket $BUCKET --env prod
         env:
           GOOGLE_CLOUD_PROJECT: hubble-261722
-          BUCKET: us-central1-hubble-2-d948d67b-bucket
+          BUCKET: us-central1-hubble-14c4ca64-bucket
 
       - name: Update Airflow variables
         uses: actions-hub/gcloud@master
         env:
           PROJECT_ID: hubble-261722
           APPLICATION_CREDENTIALS: "${{ secrets.CREDS_TEST_HUBBLE }}"
-          COMPOSER_ENVIRONMENT: hubble-2
+          COMPOSER_ENVIRONMENT: hubble
           LOCATION: us-central1
         with:
           args: >
             components install kubectl && gcloud composer environments run
             $COMPOSER_ENVIRONMENT --location $LOCATION variables import
-            -- gcsfuse/variables.json
+            -- gcsfuse/actual_mount_path/variables.json
diff --git a/airflow_variables_prod.json b/airflow_variables_prod.json
index 105a02c5..43fe0c2f 100644
--- a/airflow_variables_prod.json
+++ b/airflow_variables_prod.json
@@ -1,91 +1,5 @@
 {
-  "affinity": {
-    "default": {
-      "nodeAffinity": {
-        "requiredDuringSchedulingIgnoredDuringExecution": {
-          "nodeSelectorTerms": [
-            {
-              "matchExpressions": [
-                {
-                  "key": "cloud.google.com/gke-nodepool",
-                  "operator": "In",
-                  "values": ["default-pool"]
-                }
-              ]
-            }
-          ]
-        }
-      }
-    },
-    "backfill": {
-      "nodeAffinity": {
-        "requiredDuringSchedulingIgnoredDuringExecution": {
-          "nodeSelectorTerms": [
-            {
-              "matchExpressions": [
-                {
-                  "key": "cloud.google.com/gke-nodepool",
-                  "operator": "In",
-                  "values": ["hubble-etl"]
-                }
-              ]
-            }
-          ]
-        }
-      }
-    },
-    "cc": {
-      "nodeAffinity": {
-        "requiredDuringSchedulingIgnoredDuringExecution": {
-          "nodeSelectorTerms": [
-            {
-              "matchExpressions": [
-                {
-                  "key": "cloud.google.com/gke-nodepool",
-                  "operator": "In",
-                  "values": ["hubble-etl"]
-                }
-              ]
-            }
-          ]
-        }
-      }
-    },
-    "wocc": {
-      "nodeAffinity": {
-        "requiredDuringSchedulingIgnoredDuringExecution": {
-          "nodeSelectorTerms": [
-            {
-              "matchExpressions": [
-                {
-                  "key": "cloud.google.com/gke-nodepool",
-                  "operator": "In",
-                  "values": ["default-pool"]
-                }
-              ]
-            }
-          ]
-        }
-      }
-    },
-    "state": {
-      "nodeAffinity": {
-        "requiredDuringSchedulingIgnoredDuringExecution": {
-          "nodeSelectorTerms": [
-            {
-              "matchExpressions": [
-                {
-                  "key": "cloud.google.com/gke-nodepool",
-                  "operator": "In",
-                  "values": ["state-table"]
-                }
-              ]
-            }
-          ]
-        }
-      }
-    }
-  },
+  "affinity": {},
   "api_key_path": "/home/airflow/gcs/data/apiKey.json",
   "bq_dataset": "crypto_stellar_internal_2",
   "bq_project": "hubble-261722",
@@ -143,7 +57,7 @@
     "partnership_assets__asset_activity_fact": false,
     "trade_agg": false
   },
-  "dbt_image_name": "stellar/stellar-dbt:b621192",
+  "dbt_image_name": "stellar/stellar-dbt:8ae3438",
   "dbt_job_execution_timeout_seconds": 1800,
   "dbt_job_retries": 1,
   "dbt_mart_dataset": "sdf_marts",
@@ -151,9 +65,9 @@
   "dbt_project": "hubble-261722",
   "dbt_target": "prod",
   "dbt_threads": 12,
-  "gcs_exported_data_bucket_name": "us-central1-hubble-2-d948d67b-bucket",
+  "gcs_exported_data_bucket_name": "us-central1-hubble-14c4ca64-bucket",
   "gcs_exported_object_prefix": "dag-exported",
-  "image_name": "stellar/stellar-etl:75c9a9c",
+  "image_name": "stellar/stellar-etl:395f1f8",
   "image_output_path": "/etl/exported_data/",
   "image_pull_policy": "IfNotPresent",
   "kube_config_location": "",