From 4fca60f7ab2682713f9f688a23848aeae8b6db9a Mon Sep 17 00:00:00 2001 From: Christopher Papke Date: Tue, 8 Jul 2025 13:57:39 -0700 Subject: [PATCH 1/6] add 15.0 and 4.19.20 --- examples/aws/poc/dsf_deployment/variables.tf | 4 ++-- examples/azure/poc/dsf_deployment/variables.tf | 4 ++-- modules/aws/core/globals/main.tf | 6 +++++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/examples/aws/poc/dsf_deployment/variables.tf b/examples/aws/poc/dsf_deployment/variables.tf index cc1dc727d..39afef177 100644 --- a/examples/aws/poc/dsf_deployment/variables.tf +++ b/examples/aws/poc/dsf_deployment/variables.tf @@ -234,13 +234,13 @@ variable "tarball_location" { variable "hub_hadr" { type = bool - default = false + default = true description = "Provisions a High Availability and Disaster Recovery node for the DSF Hub" } variable "agentless_gw_hadr" { type = bool - default = false + default = true description = "Provisions a High Availability and Disaster Recovery node for the Agentless Gateway" } diff --git a/examples/azure/poc/dsf_deployment/variables.tf b/examples/azure/poc/dsf_deployment/variables.tf index 495c83274..d23ff28d8 100644 --- a/examples/azure/poc/dsf_deployment/variables.tf +++ b/examples/azure/poc/dsf_deployment/variables.tf @@ -215,13 +215,13 @@ variable "tarball_url" { variable "hub_hadr" { type = bool - default = false + default = true description = "Provisions a High Availability and Disaster Recovery node for the DSF Hub" } variable "agentless_gw_hadr" { type = bool - default = false + default = true description = "Provisions a High Availability and Disaster Recovery node for the Agentless Gateway" } diff --git a/modules/aws/core/globals/main.tf b/modules/aws/core/globals/main.tf index 50f5ee8a8..6770ba777 100644 --- a/modules/aws/core/globals/main.tf +++ b/modules/aws/core/globals/main.tf @@ -1,7 +1,11 @@ locals { sonar_tarball_s3_key_map = { - "4.19" = "jsonar-4.19.0.10.0.tar.gz" + "15.0" = "jsonar-15.0.0.10.0.tar.gz" + "15.0.0.10" = "jsonar-15.0.0.10.0.tar.gz" + + "4.19" = "jsonar-4.19.0.20.0.tar.gz" "4.19.0.10" = "jsonar-4.19.0.10.0.tar.gz" + "4.19.0.20" = "jsonar-4.19.0.20.0.tar.gz" "4.17" = "jsonar-4.17.0.10.0.tar.gz" "4.17.0.10" = "jsonar-4.17.0.10.0.tar.gz" From 230f9d7fa2e6b1ed097a22799fe5dba3a24cab89 Mon Sep 17 00:00:00 2001 From: "sivan.hajbi" Date: Tue, 16 Sep 2025 20:48:46 +0300 Subject: [PATCH 2/6] update readme --- README.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index ce09d14fa..b4577cb1d 100644 --- a/README.md +++ b/README.md @@ -616,6 +616,15 @@ The following table lists the _latest_ DSF Kit releases, their release date and
3. Added internal support for DRA version 15.1. Set the variable ‘dra_version’ to 15.1 to use it.
4. Improvements and bug fixes. + + TBD + + 1.7.33 + + + 1. Added internal support for Sonar version 15.0. Set the variable ‘sonar_version’ to 15.0 to use it. +
2. Updated the AWS and Azure POC dsf_deployment example so that Hub and Agentless Gateway HADR are enabled by default. HADR can be disabled using the ‘hub_hadr’ and ‘agentless_gw_hadr’ variables. + @@ -649,7 +658,7 @@ Before using DSF Kit to deploy DSF, it is necessary to satisfy a set of prerequi 2. Only if you chose the [CLI Deployment Mode](#cli-deployment-mode), install [Terraform](https://www.terraform.io). It is recommended on MacOS systems to use the "Package Manager" option during installation. 3. Latest Supported Terraform Version: 1.7.x. Using a higher version may result in unexpected behavior or errors. 4. [jq](https://jqlang.github.io/jq/) - Command-line JSON processor. -5. [curl](https://curl.se/) - Command-line tool for transferring data. +5. [curl](https://curl.se/) - Command-line tool for transferring data (version 8.12.1 or later). ### AWS Prerequisites From 435eb81eaa4406bcadbba4ea12d6a1e4258f4447 Mon Sep 17 00:00:00 2001 From: "sivan.hajbi" Date: Tue, 16 Sep 2025 22:08:25 +0300 Subject: [PATCH 3/6] fix sonar gz file extension --- .github/workflows/dsf_poc_cli_azure.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dsf_poc_cli_azure.yml b/.github/workflows/dsf_poc_cli_azure.yml index 3bdbbb9da..22f94c6a3 100644 --- a/.github/workflows/dsf_poc_cli_azure.yml +++ b/.github/workflows/dsf_poc_cli_azure.yml @@ -196,7 +196,7 @@ jobs: fi if [ "${{ github.event.inputs.deployment_type }}" == "sonar" ] && [ "${{ github.event.inputs.product_full_version }}" != "latest" ] && [ -n "${{ github.event.inputs.product_full_version }}" ]; then - AZ_BLOB_SONAR="jsonar-${{ github.event.inputs.product_full_version }}.tar.gaz" + AZ_BLOB_SONAR="jsonar-${{ github.event.inputs.product_full_version }}.tar.gz" else AZ_BLOB_SONAR="jsonar-4.17.0.10.0.tar.gz" fi From 8ca0d8c3193afd3e7a23b03e3a8acef08dd3d33e Mon Sep 17 00:00:00 2001 From: "sivan.hajbi" Date: Wed, 17 Sep 2025 17:14:44 +0300 Subject: [PATCH 4/6] revert hadr default values change --- examples/aws/poc/dsf_deployment/variables.tf | 4 ++-- examples/azure/poc/dsf_deployment/variables.tf | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/aws/poc/dsf_deployment/variables.tf b/examples/aws/poc/dsf_deployment/variables.tf index 04c6e38a2..1c5277aeb 100644 --- a/examples/aws/poc/dsf_deployment/variables.tf +++ b/examples/aws/poc/dsf_deployment/variables.tf @@ -273,13 +273,13 @@ variable "tarball_location" { variable "hub_hadr" { type = bool - default = true + default = false description = "Provisions a High Availability and Disaster Recovery node for the DSF Hub" } variable "agentless_gw_hadr" { type = bool - default = true + default = false description = "Provisions a High Availability and Disaster Recovery node for the Agentless Gateway" } diff --git a/examples/azure/poc/dsf_deployment/variables.tf b/examples/azure/poc/dsf_deployment/variables.tf index 8fece797f..8d79d1636 100644 --- a/examples/azure/poc/dsf_deployment/variables.tf +++ b/examples/azure/poc/dsf_deployment/variables.tf @@ -195,13 +195,13 @@ variable "tarball_url" { variable "hub_hadr" { type = bool - default = true + default = false description = "Provisions a High Availability and Disaster Recovery node for the DSF Hub" } variable "agentless_gw_hadr" { type = bool - default = true + default = false description = "Provisions a High Availability and Disaster Recovery node for the Agentless Gateway" } From 5561c7de3e3c7e2d4b16557d0f26e472450d81e8 Mon Sep 17 00:00:00 2001 From: "sivan.hajbi" Date: Wed, 17 Sep 2025 17:16:56 +0300 Subject: [PATCH 5/6] update readme --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index b4577cb1d..81a1ef85d 100644 --- a/README.md +++ b/README.md @@ -622,8 +622,7 @@ The following table lists the _latest_ DSF Kit releases, their release date and 1.7.33 - 1. Added internal support for Sonar version 15.0. Set the variable ‘sonar_version’ to 15.0 to use it. -
2. Updated the AWS and Azure POC dsf_deployment example so that Hub and Agentless Gateway HADR are enabled by default. HADR can be disabled using the ‘hub_hadr’ and ‘agentless_gw_hadr’ variables. + Added internal support for Sonar version 15.0. Set the variable ‘sonar_version’ to 15.0 to use it. From c63e2259caf5abbecc486275d2f77337377802f7 Mon Sep 17 00:00:00 2001 From: "sivan.hajbi" Date: Wed, 17 Sep 2025 17:33:19 +0300 Subject: [PATCH 6/6] update readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 81a1ef85d..b954075c5 100644 --- a/README.md +++ b/README.md @@ -815,7 +815,7 @@ This includes the following version of the DSF sub-products: - Sonar4.17.0.104.9 - 4.19.0.10 + Sonar4.17.0.104.9 - 15.0.0.10 Restrictions on modules may apply