From 09de0de67db4c0ebb2848cb3e19117fcef038789 Mon Sep 17 00:00:00 2001 From: Murdo <109604278+murdo-moj@users.noreply.github.com> Date: Thu, 26 Oct 2023 15:20:09 +0100 Subject: [PATCH 1/7] Changed config for extractor to AP job --- helm_deploy/use-of-force/Chart.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/helm_deploy/use-of-force/Chart.yaml b/helm_deploy/use-of-force/Chart.yaml index 673499d2..4ca741d5 100644 --- a/helm_deploy/use-of-force/Chart.yaml +++ b/helm_deploy/use-of-force/Chart.yaml @@ -9,5 +9,6 @@ dependencies: version: 1.1.0 repository: https://ministryofjustice.github.io/hmpps-helm-charts - name: generic-data-analytics-extractor - version: 0.1.3 + version: develop repository: https://ministryofjustice.github.io/hmpps-helm-charts + args: "extract_table_names.py && extract_pg_jsonl_snapshot.py && upload_data_file_to_data_platform.sh" From eea9d901acd1436f17cd658e8b1a8d207d0b0471 Mon Sep 17 00:00:00 2001 From: Murdo <109604278+murdo-moj@users.noreply.github.com> Date: Thu, 26 Oct 2023 15:24:09 +0100 Subject: [PATCH 2/7] Update helm_deploy/use-of-force/Chart.yaml --- helm_deploy/use-of-force/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm_deploy/use-of-force/Chart.yaml b/helm_deploy/use-of-force/Chart.yaml index 4ca741d5..33e09d17 100644 --- a/helm_deploy/use-of-force/Chart.yaml +++ b/helm_deploy/use-of-force/Chart.yaml @@ -11,4 +11,4 @@ dependencies: - name: generic-data-analytics-extractor version: develop repository: https://ministryofjustice.github.io/hmpps-helm-charts - args: "extract_table_names.py && extract_pg_jsonl_snapshot.py && upload_data_file_to_data_platform.sh" + args: "extract_table_names.py && extract_psql_all_tables_to_csv.sh && upload_data_file_to_data_platform.sh" From 90d16c2339a8f814a650ec031511d3476a1e0d14 Mon Sep 17 00:00:00 2001 From: Murdo <109604278+murdo-moj@users.noreply.github.com> Date: Thu, 26 Oct 2023 15:34:31 +0100 Subject: [PATCH 3/7] Update helm_deploy/use-of-force/Chart.yaml --- helm_deploy/use-of-force/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm_deploy/use-of-force/Chart.yaml b/helm_deploy/use-of-force/Chart.yaml index 33e09d17..47fb403e 100644 --- a/helm_deploy/use-of-force/Chart.yaml +++ b/helm_deploy/use-of-force/Chart.yaml @@ -9,6 +9,6 @@ dependencies: version: 1.1.0 repository: https://ministryofjustice.github.io/hmpps-helm-charts - name: generic-data-analytics-extractor - version: develop + version: 1.2.0 repository: https://ministryofjustice.github.io/hmpps-helm-charts args: "extract_table_names.py && extract_psql_all_tables_to_csv.sh && upload_data_file_to_data_platform.sh" From 936ec58995c7f5ae8df2d1986e06b5313261c914 Mon Sep 17 00:00:00 2001 From: Murdo <109604278+murdo-moj@users.noreply.github.com> Date: Thu, 26 Oct 2023 15:37:38 +0100 Subject: [PATCH 4/7] Update helm_deploy/use-of-force/Chart.yaml --- helm_deploy/use-of-force/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm_deploy/use-of-force/Chart.yaml b/helm_deploy/use-of-force/Chart.yaml index 47fb403e..49f07e5d 100644 --- a/helm_deploy/use-of-force/Chart.yaml +++ b/helm_deploy/use-of-force/Chart.yaml @@ -9,6 +9,6 @@ dependencies: version: 1.1.0 repository: https://ministryofjustice.github.io/hmpps-helm-charts - name: generic-data-analytics-extractor - version: 1.2.0 + version: 1.2 repository: https://ministryofjustice.github.io/hmpps-helm-charts args: "extract_table_names.py && extract_psql_all_tables_to_csv.sh && upload_data_file_to_data_platform.sh" From c6066e1e960e78e8082f38f1e7ec89b4bfb4e83f Mon Sep 17 00:00:00 2001 From: Murdo <109604278+murdo-moj@users.noreply.github.com> Date: Thu, 26 Oct 2023 15:40:34 +0100 Subject: [PATCH 5/7] Update helm_deploy/use-of-force/Chart.yaml --- helm_deploy/use-of-force/Chart.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/helm_deploy/use-of-force/Chart.yaml b/helm_deploy/use-of-force/Chart.yaml index 49f07e5d..78131b54 100644 --- a/helm_deploy/use-of-force/Chart.yaml +++ b/helm_deploy/use-of-force/Chart.yaml @@ -9,6 +9,8 @@ dependencies: version: 1.1.0 repository: https://ministryofjustice.github.io/hmpps-helm-charts - name: generic-data-analytics-extractor - version: 1.2 + version: 0.1.3 + image: + tag: 1.2.0 repository: https://ministryofjustice.github.io/hmpps-helm-charts args: "extract_table_names.py && extract_psql_all_tables_to_csv.sh && upload_data_file_to_data_platform.sh" From cd4acd7146f0ef654e3b3427ea2451f64a204cf2 Mon Sep 17 00:00:00 2001 From: Murdo <109604278+murdo-moj@users.noreply.github.com> Date: Fri, 27 Oct 2023 10:30:34 +0100 Subject: [PATCH 6/7] Only defined env vars for dev --- helm_deploy/use-of-force/Chart.yaml | 3 --- helm_deploy/values-dev.yaml | 5 +++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/helm_deploy/use-of-force/Chart.yaml b/helm_deploy/use-of-force/Chart.yaml index 78131b54..673499d2 100644 --- a/helm_deploy/use-of-force/Chart.yaml +++ b/helm_deploy/use-of-force/Chart.yaml @@ -10,7 +10,4 @@ dependencies: repository: https://ministryofjustice.github.io/hmpps-helm-charts - name: generic-data-analytics-extractor version: 0.1.3 - image: - tag: 1.2.0 repository: https://ministryofjustice.github.io/hmpps-helm-charts - args: "extract_table_names.py && extract_psql_all_tables_to_csv.sh && upload_data_file_to_data_platform.sh" diff --git a/helm_deploy/values-dev.yaml b/helm_deploy/values-dev.yaml index 198d5f99..e139d876 100644 --- a/helm_deploy/values-dev.yaml +++ b/helm_deploy/values-dev.yaml @@ -28,3 +28,8 @@ env: COMPONENT_API_URL: "https://frontend-components-dev.hmpps.service.justice.gov.uk" ENVIRONMENT_NAME: 'DEV' HMPPS_MANAGE_USERS_API_URL: https://manage-users-api-dev.hmpps.service.justice.gov.uk + +generic-data-analytics-extractor: + image: + tag: 1.2.0 + args: "extract_table_names.py && extract_psql_all_tables_to_csv.sh && upload_data_file_to_data_platform.sh" \ No newline at end of file From 634180b995793fb99ac02d5d4fd2089be6446638 Mon Sep 17 00:00:00 2001 From: Murdo <109604278+murdo-moj@users.noreply.github.com> Date: Fri, 27 Oct 2023 10:31:08 +0100 Subject: [PATCH 7/7] Update helm_deploy/values-dev.yaml --- helm_deploy/values-dev.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/helm_deploy/values-dev.yaml b/helm_deploy/values-dev.yaml index e139d876..7f6627da 100644 --- a/helm_deploy/values-dev.yaml +++ b/helm_deploy/values-dev.yaml @@ -32,4 +32,5 @@ env: generic-data-analytics-extractor: image: tag: 1.2.0 - args: "extract_table_names.py && extract_psql_all_tables_to_csv.sh && upload_data_file_to_data_platform.sh" \ No newline at end of file + args: "extract_table_names.py && extract_psql_all_tables_to_csv.sh && upload_data_file_to_data_platform.sh" + \ No newline at end of file