Merge branch 'GoogleCloudPlatform:main' into migrate_irs_20241029

GoogleCloudPlatform · Nov 4, 2024 · 1f88f46 · 1f88f46
2 parents 5f2cdb7 + a81b56f
commit 1f88f46
Show file tree

Hide file tree

Showing 14 changed files with 787 additions and 350 deletions.
diff --git a/datasets/iowa_liquor_sales/pipelines/sales/pipeline.yaml b/datasets/iowa_liquor_sales/pipelines/sales/pipeline.yaml
@@ -147,7 +147,7 @@ dag:
         task_id: "delete_cluster"
         project_id: "{{ var.value.gcp_project }}"
         location: "us-central1-c"
-        name: pdp-imdb-reviews
+        name: pdp-iowa-liquor-sales
 
     - operator: "BashOperator"
       description: "Combine the split files into one"

diff --git a/datasets/iowa_liquor_sales/pipelines/sales/sales_dag.py b/datasets/iowa_liquor_sales/pipelines/sales/sales_dag.py
@@ -95,7 +95,7 @@
         task_id="delete_cluster",
         project_id="{{ var.value.gcp_project }}",
         location="us-central1-c",
-        name="pdp-imdb-reviews",
+        name="pdp-iowa-liquor-sales",
     )
 
     # Combine the split files into one

diff --git a/datasets/libraries_io/pipelines/dependencies/dependencies_dag.py b/datasets/libraries_io/pipelines/dependencies/dependencies_dag.py
@@ -15,7 +15,7 @@
 
 from airflow import DAG
 from airflow.operators import bash
-from airflow.providers.cncf.kubernetes.operators import kubernetes_pod
+from airflow.providers.google.cloud.operators import kubernetes_engine
 from airflow.providers.google.cloud.transfers import gcs_to_bigquery
 
 default_args = {
@@ -33,6 +33,23 @@
     catchup=False,
     default_view="graph",
 ) as dag:
+    create_cluster = kubernetes_engine.GKECreateClusterOperator(
+        task_id="create_cluster",
+        project_id="{{ var.value.gcp_project }}",
+        location="us-central1-c",
+        body={
+            "name": "pdp-libraries-io-dependencies",
+            "initial_node_count": 1,
+            "network": "{{ var.value.vpc_network }}",
+            "node_config": {
+                "machine_type": "e2-standard-16",
+                "oauth_scopes": [
+                    "https://www.googleapis.com/auth/devstorage.read_write",
+                    "https://www.googleapis.com/auth/cloud-platform",
+                ],
+            },
+        },
+    )
 
     # Fetch data gcs - gcs
     bash_gcs_to_gcs = bash.BashOperator(
@@ -41,12 +58,14 @@
     )
 
     # Run CSV transform within kubernetes pod
-    transform_dependencies = kubernetes_pod.KubernetesPodOperator(
+    transform_dependencies = kubernetes_engine.GKEStartPodOperator(
         task_id="transform_dependencies",
         startup_timeout_seconds=600,
         name="dependencies",
-        namespace="composer",
-        service_account_name="datasets",
+        namespace="default",
+        project_id="{{ var.value.gcp_project }}",
+        location="us-central1-c",
+        cluster_name="pdp-libraries-io-dependencies",
         image_pull_policy="Always",
         image="{{ var.json.libraries_io.container_registry.run_csv_transform_kub }}",
         env_vars={
@@ -61,10 +80,10 @@
             "RENAME_MAPPINGS": '{"ID":"id","Platform":"platform","Project Name":"project_name","Project ID":"project_id","Version Number":"version_number", "Version ID":"version_id","Dependency Name":"dependency_name","Dependency Platform":"dependency_platform", "Dependency Kind":"dependency_kind","Optional Dependency":"optional_dependency", "Dependency Requirements":"dependency_requirements","Dependency Project ID":"dependency_project_id"}',
             "CSV_HEADERS": '["id","platform","project_name","project_id","version_number","version_id","dependency_name","dependency_platform", "dependency_kind","optional_dependency","dependency_requirements","dependency_project_id"]',
         },
-        resources={
-            "request_memory": "4G",
-            "request_cpu": "1",
-            "request_ephemeral_storage": "10G",
+        container_resources={
+            "memory": {"request": "16Gi"},
+            "cpu": {"request": "1"},
+            "ephemeral-storage": {"request": "10Gi"},
         },
     )
 
@@ -155,12 +174,14 @@
     )
 
     # Run CSV transform within kubernetes pod
-    transform_dependencies_2 = kubernetes_pod.KubernetesPodOperator(
+    transform_dependencies_2 = kubernetes_engine.GKEStartPodOperator(
         task_id="transform_dependencies_2",
         startup_timeout_seconds=600,
         name="dependencies",
-        namespace="composer",
-        service_account_name="datasets",
+        namespace="default",
+        project_id="{{ var.value.gcp_project }}",
+        location="us-central1-c",
+        cluster_name="pdp-libraries-io-dependencies",
         image_pull_policy="Always",
         image="{{ var.json.libraries_io.container_registry.run_csv_transform_kub }}",
         env_vars={
@@ -175,10 +196,10 @@
             "RENAME_MAPPINGS": '{"ID":"id","Platform":"platform","Project Name":"project_name","Project ID":"project_id","Version Number":"version_number", "Version ID":"version_id","Dependency Name":"dependency_name","Dependency Platform":"dependency_platform", "Dependency Kind":"dependency_kind","Optional Dependency":"optional_dependency", "Dependency Requirements":"dependency_requirements","Dependency Project ID":"dependency_project_id"}',
             "CSV_HEADERS": '["id","platform","project_name","project_id","version_number","version_id","dependency_name","dependency_platform", "dependency_kind","optional_dependency","dependency_requirements","dependency_project_id"]',
         },
-        resources={
-            "request_memory": "4G",
-            "request_cpu": "1",
-            "request_ephemeral_storage": "10G",
+        container_resources={
+            "memory": {"request": "16Gi"},
+            "cpu": {"request": "1"},
+            "ephemeral-storage": {"request": "10Gi"},
         },
     )
 
@@ -269,12 +290,14 @@
     )
 
     # Run CSV transform within kubernetes pod
-    transform_dependencies_3 = kubernetes_pod.KubernetesPodOperator(
+    transform_dependencies_3 = kubernetes_engine.GKEStartPodOperator(
         task_id="transform_dependencies_3",
         startup_timeout_seconds=600,
         name="dependencies",
-        namespace="composer",
-        service_account_name="datasets",
+        namespace="default",
+        project_id="{{ var.value.gcp_project }}",
+        location="us-central1-c",
+        cluster_name="pdp-libraries-io-dependencies",
         image_pull_policy="Always",
         image="{{ var.json.libraries_io.container_registry.run_csv_transform_kub }}",
         env_vars={
@@ -289,12 +312,18 @@
             "RENAME_MAPPINGS": '{"ID":"id","Platform":"platform","Project Name":"project_name","Project ID":"project_id","Version Number":"version_number", "Version ID":"version_id","Dependency Name":"dependency_name","Dependency Platform":"dependency_platform", "Dependency Kind":"dependency_kind","Optional Dependency":"optional_dependency", "Dependency Requirements":"dependency_requirements","Dependency Project ID":"dependency_project_id"}',
             "CSV_HEADERS": '["id","platform","project_name","project_id","version_number","version_id","dependency_name","dependency_platform", "dependency_kind","optional_dependency","dependency_requirements","dependency_project_id"]',
         },
-        resources={
-            "request_memory": "4G",
-            "request_cpu": "1",
-            "request_ephemeral_storage": "10G",
+        container_resources={
+            "memory": {"request": "16Gi"},
+            "cpu": {"request": "1"},
+            "ephemeral-storage": {"request": "10Gi"},
         },
     )
+    delete_cluster = kubernetes_engine.GKEDeleteClusterOperator(
+        task_id="delete_cluster",
+        project_id="{{ var.value.gcp_project }}",
+        location="us-central1-c",
+        name="pdp-libraries-io-dependencies",
+    )
 
     # Task to load CSV data to a BigQuery table
     load_dependencies_to_bq_3 = gcs_to_bigquery.GCSToBigQueryOperator(
@@ -384,7 +413,9 @@
 
     (
         bash_gcs_to_gcs
+        >> create_cluster
         >> [transform_dependencies, transform_dependencies_2, transform_dependencies_3]
+        >> delete_cluster
         >> load_dependencies_to_bq
         >> load_dependencies_to_bq_2
         >> load_dependencies_to_bq_3

diff --git a/datasets/libraries_io/pipelines/dependencies/pipeline.yaml b/datasets/libraries_io/pipelines/dependencies/pipeline.yaml
@@ -32,6 +32,21 @@ dag:
     default_view: graph
 
   tasks:
+    - operator: "GKECreateClusterOperator"
+      args:
+        task_id: "create_cluster"
+        project_id: "{{ var.value.gcp_project }}"
+        location: "us-central1-c"
+        body:
+          name: pdp-libraries-io-dependencies
+          initial_node_count: 1
+          network: "{{ var.value.vpc_network }}"
+          node_config:
+            machine_type: e2-standard-16
+            oauth_scopes:
+              - https://www.googleapis.com/auth/devstorage.read_write
+              - https://www.googleapis.com/auth/cloud-platform
+
     - operator: "BashOperator"
       description: "Fetch data gcs - gcs"
       args:
@@ -53,14 +68,16 @@ dag:
               rm /home/airflow/gcs/data/libraries_io/dependencies/dependencies.c
           fi
 
-    - operator: "KubernetesPodOperator"
+    - operator: "GKEStartPodOperator"
       description: "Run CSV transform within kubernetes pod"
       args:
         task_id: "transform_dependencies"
         startup_timeout_seconds: 600
         name: "dependencies"
-        namespace: "composer"
-        service_account_name: "datasets"
+        namespace: "default"
+        project_id: "{{ var.value.gcp_project }}"
+        location: "us-central1-c"
+        cluster_name: pdp-libraries-io-dependencies
         image_pull_policy: "Always"
         image: "{{ var.json.libraries_io.container_registry.run_csv_transform_kub }}"
         env_vars:
@@ -80,10 +97,13 @@ dag:
           CSV_HEADERS: >-
             ["id","platform","project_name","project_id","version_number","version_id","dependency_name","dependency_platform",
             "dependency_kind","optional_dependency","dependency_requirements","dependency_project_id"]
-        resources:
-          request_memory: "4G"
-          request_cpu: "1"
-          request_ephemeral_storage: "10G"
+        container_resources:
+          memory:
+            request: "16Gi"
+          cpu:
+            request: "1"
+          ephemeral-storage:
+            request: "10Gi"
 
     - operator: "GoogleCloudStorageToBigQueryOperator"
       description: "Task to load CSV data to a BigQuery table"
@@ -146,14 +166,16 @@ dag:
             description: "The unique primary key of the project for this dependency in the Libraries.io database."
             mode: "nullable"
 
-    - operator: "KubernetesPodOperator"
+    - operator: "GKEStartPodOperator"
       description: "Run CSV transform within kubernetes pod"
       args:
         task_id: "transform_dependencies_2"
         startup_timeout_seconds: 600
         name: "dependencies"
-        namespace: "composer"
-        service_account_name: "datasets"
+        namespace: "default"
+        project_id: "{{ var.value.gcp_project }}"
+        location: "us-central1-c"
+        cluster_name: pdp-libraries-io-dependencies
         image_pull_policy: "Always"
         image: "{{ var.json.libraries_io.container_registry.run_csv_transform_kub }}"
         env_vars:
@@ -173,10 +195,13 @@ dag:
           CSV_HEADERS: >-
             ["id","platform","project_name","project_id","version_number","version_id","dependency_name","dependency_platform",
             "dependency_kind","optional_dependency","dependency_requirements","dependency_project_id"]
-        resources:
-          request_memory: "4G"
-          request_cpu: "1"
-          request_ephemeral_storage: "10G"
+        container_resources:
+          memory:
+            request: "16Gi"
+          cpu:
+            request: "1"
+          ephemeral-storage:
+            request: "10Gi"
 
     - operator: "GoogleCloudStorageToBigQueryOperator"
       description: "Task to load CSV data to a BigQuery table"
@@ -239,14 +264,16 @@ dag:
             description: "The unique primary key of the project for this dependency in the Libraries.io database."
             mode: "nullable"
 
-    - operator: "KubernetesPodOperator"
+    - operator: "GKEStartPodOperator"
       description: "Run CSV transform within kubernetes pod"
       args:
         task_id: "transform_dependencies_3"
         startup_timeout_seconds: 600
         name: "dependencies"
-        namespace: "composer"
-        service_account_name: "datasets"
+        namespace: "default"
+        project_id: "{{ var.value.gcp_project }}"
+        location: "us-central1-c"
+        cluster_name: pdp-libraries-io-dependencies
         image_pull_policy: "Always"
         image: "{{ var.json.libraries_io.container_registry.run_csv_transform_kub }}"
         env_vars:
@@ -266,10 +293,20 @@ dag:
           CSV_HEADERS: >-
             ["id","platform","project_name","project_id","version_number","version_id","dependency_name","dependency_platform",
             "dependency_kind","optional_dependency","dependency_requirements","dependency_project_id"]
-        resources:
-          request_memory: "4G"
-          request_cpu: "1"
-          request_ephemeral_storage: "10G"
+        container_resources:
+          memory:
+            request: "16Gi"
+          cpu:
+            request: "1"
+          ephemeral-storage:
+            request: "10Gi"
+
+    - operator: "GKEDeleteClusterOperator"
+      args:
+        task_id: "delete_cluster"
+        project_id: "{{ var.value.gcp_project }}"
+        location: "us-central1-c"
+        name: pdp-libraries-io-dependencies
 
     - operator: "GoogleCloudStorageToBigQueryOperator"
       description: "Task to load CSV data to a BigQuery table"
@@ -333,4 +370,4 @@ dag:
             mode: "nullable"
 
   graph_paths:
-    - "bash_gcs_to_gcs >> [transform_dependencies,transform_dependencies_2,transform_dependencies_3] >> load_dependencies_to_bq >> load_dependencies_to_bq_2 >> load_dependencies_to_bq_3"
+    - "bash_gcs_to_gcs >> create_cluster >> [transform_dependencies,transform_dependencies_2,transform_dependencies_3] >> delete_cluster >> load_dependencies_to_bq >> load_dependencies_to_bq_2 >> load_dependencies_to_bq_3"
diff --git a/datasets/libraries_io/pipelines/projects/pipeline.yaml b/datasets/libraries_io/pipelines/projects/pipeline.yaml
@@ -49,14 +49,31 @@ dag:
               cp /home/airflow/gcs/data/libraries_io/libraries-1.4.0-2018-12-22/projects-1.4.0-2018-12-22.csv /home/airflow/gcs/data/libraries_io/projects/projects.csv
           fi
 
-    - operator: "KubernetesPodOperator"
+    - operator: "GKECreateClusterOperator"
+      args:
+        task_id: "create_cluster"
+        project_id: "{{ var.value.gcp_project }}"
+        location: "us-central1-c"
+        body:
+          name: pdp-libraries-io-projects
+          initial_node_count: 1
+          network: "{{ var.value.vpc_network }}"
+          node_config:
+            machine_type: e2-standard-16
+            oauth_scopes:
+              - https://www.googleapis.com/auth/devstorage.read_write
+              - https://www.googleapis.com/auth/cloud-platform
+
+    - operator: "GKEStartPodOperator"
       description: "Run CSV transform within kubernetes pod"
       args:
         task_id: "transform_projects"
         startup_timeout_seconds: 600
         name: "projects"
-        namespace: "composer"
-        service_account_name: "datasets"
+        namespace: "default"
+        project_id: "{{ var.value.gcp_project }}"
+        location: "us-central1-c"
+        cluster_name: pdp-libraries-io-projects
         image_pull_policy: "Always"
         image: "{{ var.json.libraries_io.container_registry.run_csv_transform_kub }}"
         env_vars:
@@ -80,10 +97,20 @@ dag:
             "Latest Release Number":"latest_release_number","Package Manager ID":"package_manager_id","Dependent Projects Count":"dependent_projects_count",
             "Language":"language","Status":"status","Last synced Timestamp":"last_synced_timestamp","Dependent Repositories Count":"dependent_repositories_count",
             "Repository ID":"repository_id"}
-        resources:
-          request_memory: "4G"
-          request_cpu: "1"
-          request_ephemeral_storage: "10G"
+        container_resources:
+          memory:
+            request: "16Gi"
+          cpu:
+            request: "1"
+          ephemeral-storage:
+            request: "10Gi"
+
+    - operator: "GKEDeleteClusterOperator"
+      args:
+        task_id: "delete_cluster"
+        project_id: "{{ var.value.gcp_project }}"
+        location: "us-central1-c"
+        name: pdp-libraries-io-projects
 
     - operator: "GoogleCloudStorageToBigQueryOperator"
       description: "Task to load CSV data to a BigQuery table"
@@ -183,4 +210,4 @@ dag:
             mode: "nullable"
 
   graph_paths:
-    - "bash_gcs_to_gcs >> transform_projects >> load_projects_to_bq"
+    - "create_cluster >> bash_gcs_to_gcs >> transform_projects >> delete_cluster >> load_projects_to_bq"