Merge branch 'release-23-2-0' into 'main'

release-23-2-0 See merge request cloudsolutions/automation-templates/f5-azure-arm-templates-v2!143
F5Networks · Aug 17, 2023 · 2ea5ec7 · 2ea5ec7
2 parents 4670b43 + db4c0b3
commit 2ea5ec7
Show file tree

Hide file tree

Showing 88 changed files with 535 additions and 531 deletions.
diff --git a/Makefile b/Makefile
@@ -48,7 +48,7 @@ run_smoke_tests: run_crawler
 
 run_sync_at_metadata:
 	echo "Syncing AT component metadata"
-	cd ${SYNC_AT_DIR} && ./sync_at_components_metadata.sh --config-directories ../../examples/autoscale/bigip-configurations,../../examples/quickstart/bigip-configurations,../../examples/failover/bigip-configurations --template-directory ../../examples --runtime-init-package-url https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v1.6.1/dist/f5-bigip-runtime-init-1.6.1-1.gz.run --cloud azure
+	cd ${SYNC_AT_DIR} && ./sync_at_components_metadata.sh --config-directories ../../examples/autoscale/bigip-configurations,../../examples/quickstart/bigip-configurations,../../examples/failover/bigip-configurations --template-directory ../../examples --runtime-init-package-url https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v1.6.2/dist/f5-bigip-runtime-init-1.6.2-1.gz.run --cloud azure
 
 run_parameter_generator:
 	echo "Generating v2 input parameters files"

diff --git a/automated-test-scripts/data/test_policies/shimkus.yaml b/automated-test-scripts/data/test_policies/shimkus.yaml
@@ -49,7 +49,7 @@ azure-arm-failover-byol-example-test:
 azure-arm-failover-payg-example-test:
   test-url: "file://automated-test-scripts/f5-azure-arm-templates-v2/examples/failover/daily_test_full.yaml"
   run: "random"
-  random-num-of-tests: 2
+  random-num-of-tests: 1
   parameters-files:
     - "automated-test-scripts/data/f5-azure-arm-templates-v2/examples/failover/payg/full/demo.yaml"
     - "automated-test-scripts/data/f5-azure-arm-templates-v2/examples/failover/payg/full/prod.yaml"
@@ -82,7 +82,7 @@ azure-arm-failover-payg-existing-test:
 azure-arm-quickstart-byol-example-test:
   test-url: "file://automated-test-scripts/f5-azure-arm-templates-v2/examples/quickstart/daily_test_full.yaml"
   run: "random"
-  random-num-of-tests: 1
+  random-num-of-tests: 0
   parameters-files:
     - "automated-test-scripts/data/f5-azure-arm-templates-v2/examples/quickstart/byol/full/demo_app_1nic.yaml"
     - "automated-test-scripts/data/f5-azure-arm-templates-v2/examples/quickstart/byol/full/demo_app_2nic.yaml"
@@ -152,7 +152,7 @@ azure-application-module-test:
 azure-bigip-autoscale-module-test:
   test-url: "file://automated-test-scripts/f5-azure-arm-templates-v2/examples/modules/bigip-autoscale/daily_test.yaml"
   run: "random"
-  random-num-of-tests: 1
+  random-num-of-tests: 0
   parameters-files:
     - "automated-test-scripts/data/f5-azure-arm-templates-v2/examples/modules/bigip-autoscale/prepub_parameters.yaml"
     - "automated-test-scripts/data/f5-azure-arm-templates-v2/examples/modules/bigip-autoscale/prepub_parameters1.yaml"
@@ -165,7 +165,7 @@ azure-bigip-autoscale-module-test:
 azure-bigip-standalone-module-test:
   test-url: "file://automated-test-scripts/f5-azure-arm-templates-v2/examples/modules/bigip-standalone/daily_test.yaml"
   run: "random"
-  random-num-of-tests: 1
+  random-num-of-tests: 0
   parameters-files:
     - "automated-test-scripts/data/f5-azure-arm-templates-v2/examples/modules/bigip-standalone/prepub_parameters.yaml"
     - "automated-test-scripts/data/f5-azure-arm-templates-v2/examples/modules/bigip-standalone/prepub_parameters1.yaml"

diff --git a/automated-test-scripts/f5-azure-arm-templates-v2/examples/failover/create_deployment.sh b/automated-test-scripts/f5-azure-arm-templates-v2/examples/failover/create_deployment.sh
@@ -55,12 +55,6 @@ fi
 /usr/bin/yq e ".controls.logLevel = \"<LOG LEVEL>\"" -i <DEWPOINT JOB ID>01.yaml
 /usr/bin/yq e ".controls.logLevel = \"<LOG LEVEL>\"" -i <DEWPOINT JOB ID>02.yaml
 
-# Update cfe tag
-/usr/bin/yq e ".extension_services.service_operations.[1].value.externalStorage.scopingTags.f5_cloud_failover_label = \"<RESOURCE GROUP>\"" -i <DEWPOINT JOB ID>01.yaml
-/usr/bin/yq e ".extension_services.service_operations.[1].value.externalStorage.scopingTags.f5_cloud_failover_label = \"<RESOURCE GROUP>\"" -i <DEWPOINT JOB ID>02.yaml
-/usr/bin/yq e ".extension_services.service_operations.[1].value.failoverAddresses.scopingTags.f5_cloud_failover_label = \"<RESOURCE GROUP>\"" -i <DEWPOINT JOB ID>01.yaml
-/usr/bin/yq e ".extension_services.service_operations.[1].value.failoverAddresses.scopingTags.f5_cloud_failover_label = \"<RESOURCE GROUP>\"" -i <DEWPOINT JOB ID>02.yaml
-
 if [[ "<PROVISION APP>" == "True" ]]; then
     # Use CDN for WAF policy since failover not published yet
     /usr/bin/yq e ".extension_services.service_operations.[2].value.Tenant_1.Shared.Custom_WAF_Policy.url = \"https://cdn.f5.com/product/cloudsolutions/solution-scripts/Rapid_Deployment_Policy_13_1.xml\"" -i <DEWPOINT JOB ID>01.yaml

diff --git a/...t-scripts/f5-azure-arm-templates-v2/examples/failover/create_deployment_existing_stack.sh b/...t-scripts/f5-azure-arm-templates-v2/examples/failover/create_deployment_existing_stack.sh
@@ -70,12 +70,6 @@ fi
 /usr/bin/yq e ".controls.logLevel = \"<LOG LEVEL>\"" -i <DEWPOINT JOB ID>01.yaml
 /usr/bin/yq e ".controls.logLevel = \"<LOG LEVEL>\"" -i <DEWPOINT JOB ID>02.yaml
 
-# Update cfe tag
-/usr/bin/yq e ".extension_services.service_operations.[1].value.externalStorage.scopingTags.f5_cloud_failover_label = \"<RESOURCE GROUP>\"" -i <DEWPOINT JOB ID>01.yaml
-/usr/bin/yq e ".extension_services.service_operations.[1].value.externalStorage.scopingTags.f5_cloud_failover_label = \"<RESOURCE GROUP>\"" -i <DEWPOINT JOB ID>02.yaml
-/usr/bin/yq e ".extension_services.service_operations.[1].value.failoverAddresses.scopingTags.f5_cloud_failover_label = \"<RESOURCE GROUP>\"" -i <DEWPOINT JOB ID>01.yaml
-/usr/bin/yq e ".extension_services.service_operations.[1].value.failoverAddresses.scopingTags.f5_cloud_failover_label = \"<RESOURCE GROUP>\"" -i <DEWPOINT JOB ID>02.yaml
-
 if [[ "<PROVISION APP>" == "True" ]]; then
     # Use CDN for WAF policy since failover not published yet
     /usr/bin/yq e ".extension_services.service_operations.[2].value.Tenant_1.Shared.Custom_WAF_Policy.url = \"https://cdn.f5.com/product/cloudsolutions/solution-scripts/Rapid_Deployment_Policy_13_1.xml\"" -i <DEWPOINT JOB ID>01.yaml

diff --git a/cloud-tools b/cloud-tools
diff --git a/examples/autoscale/bigip-configurations/runtime-init-conf-bigiq-with-app.yaml b/examples/autoscale/bigip-configurations/runtime-init-conf-bigiq-with-app.yaml
@@ -62,11 +62,11 @@ bigip_ready_enabled: []
 extension_packages:
   install_operations:
     - extensionType: do
-      extensionVersion: 1.38.0
-      extensionHash: d52c0723fc5ac0ca5af002874acae165e2319e8793afcbf596f813c132427f9c
+      extensionVersion: 1.39.0
+      extensionHash: 4a67449195a53683a159b42857edd49a757da1a5a2029ccf94c4d6aa11ae4cda
     - extensionType: as3
-      extensionVersion: 3.45.0
-      extensionHash: 35e7a7efae33a9539e3df52ba594222f93231883f146d4c1fc36737dacc084b8
+      extensionVersion: 3.46.0
+      extensionHash: 9550bcdcd1ffe1f002fa5e3c71b8818877d9c7e161f5c68027c82ad85e56e924
     - extensionType: ts
       extensionVersion: 1.33.0
       extensionHash: 573d8cf589d545b272250ea19c9c124cf8ad5bcdd169dbe2139e82ce4d51a449
@@ -85,8 +85,6 @@ extension_services:
           class: Tenant
           My_DbVariables:
             class: DbVariables
-            provision.extramb: 1000
-            restjavad.useextramb: true
             ui.advisory.color: blue
             ui.advisory.text: "Provisioned via Runtime Init and DO"
           My_Dns:
@@ -201,7 +199,7 @@ extension_services:
             Custom_WAF_Policy:
               class: WAF_Policy
               url: >-
-                https://raw.githubusercontent.com/F5Networks/f5-azure-arm-templates-v2/v2.8.0.0/examples/autoscale/bigip-configurations/Rapid_Deployment_Policy_13_1.xml
+                https://raw.githubusercontent.com/F5Networks/f5-azure-arm-templates-v2/v2.9.0.0/examples/autoscale/bigip-configurations/Rapid_Deployment_Policy_13_1.xml
               enforcementMode: blocking
               ignoreChanges: false
           HTTP_Service:

diff --git a/examples/autoscale/bigip-configurations/runtime-init-conf-payg-with-app.yaml b/examples/autoscale/bigip-configurations/runtime-init-conf-payg-with-app.yaml
@@ -49,11 +49,11 @@ bigip_ready_enabled: []
 extension_packages:
   install_operations:
     - extensionType: do
-      extensionVersion: 1.38.0
-      extensionHash: d52c0723fc5ac0ca5af002874acae165e2319e8793afcbf596f813c132427f9c
+      extensionVersion: 1.39.0
+      extensionHash: 4a67449195a53683a159b42857edd49a757da1a5a2029ccf94c4d6aa11ae4cda
     - extensionType: as3
-      extensionVersion: 3.45.0
-      extensionHash: 35e7a7efae33a9539e3df52ba594222f93231883f146d4c1fc36737dacc084b8
+      extensionVersion: 3.46.0
+      extensionHash: 9550bcdcd1ffe1f002fa5e3c71b8818877d9c7e161f5c68027c82ad85e56e924
     - extensionType: ts
       extensionVersion: 1.33.0
       extensionHash: 573d8cf589d545b272250ea19c9c124cf8ad5bcdd169dbe2139e82ce4d51a449
@@ -71,8 +71,6 @@ extension_services:
           class: Tenant
           My_DbVariables:
             class: DbVariables
-            provision.extramb: 1000
-            restjavad.useextramb: true
             ui.advisory.color: blue
             ui.advisory.text: "Provisioned via Runtime Init and DO"
           My_Dns:
@@ -174,7 +172,7 @@ extension_services:
             Custom_WAF_Policy:
               class: WAF_Policy
               url: >-
-                https://raw.githubusercontent.com/F5Networks/f5-azure-arm-templates-v2/v2.8.0.0/examples/autoscale/bigip-configurations/Rapid_Deployment_Policy_13_1.xml
+                https://raw.githubusercontent.com/F5Networks/f5-azure-arm-templates-v2/v2.9.0.0/examples/autoscale/bigip-configurations/Rapid_Deployment_Policy_13_1.xml
               enforcementMode: blocking
               ignoreChanges: false
           HTTP_Service:

diff --git a/examples/autoscale/bigiq/README.md b/examples/autoscale/bigiq/README.md
diff --git a/examples/autoscale/bigiq/azuredeploy-existing-network.json b/examples/autoscale/bigiq/azuredeploy-existing-network.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
-  "contentVersion": "2.8.0.0",
+  "contentVersion": "2.9.0.0",
   "parameters": {
     "templateBaseUrl": {
       "defaultValue": "https://cdn.f5.com/product/cloudsolutions/",
@@ -75,14 +75,14 @@
       "type": "string"
     },
     "bigIpRuntimeInitConfig": {
-      "defaultValue": "https://raw.githubusercontent.com/F5Networks/f5-azure-arm-templates-v2/v2.8.0.0/examples/autoscale/bigip-configurations/runtime-init-conf-bigiq-with-app.yaml",
+      "defaultValue": "https://raw.githubusercontent.com/F5Networks/f5-azure-arm-templates-v2/v2.9.0.0/examples/autoscale/bigip-configurations/runtime-init-conf-bigiq-with-app.yaml",
       "metadata": {
         "description": "Supply a URL to the bigip-runtime-init configuration file in YAML or JSON format, or an escaped JSON string to use for f5-bigip-runtime-init configuration."
       },
       "type": "string"
     },
     "bigIpRuntimeInitPackageUrl": {
-      "defaultValue": "https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v1.6.1/dist/f5-bigip-runtime-init-1.6.1-1.gz.run",
+      "defaultValue": "https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v1.6.2/dist/f5-bigip-runtime-init-1.6.2-1.gz.run",
       "metadata": {
         "description": "URL for BIG-IP Runtime Init package"
       },

diff --git a/examples/autoscale/bigiq/azuredeploy-existing-network.parameters.json b/examples/autoscale/bigiq/azuredeploy-existing-network.parameters.json
@@ -1,12 +1,12 @@
 {
   "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
-  "contentVersion": "2.8.0.0",
+  "contentVersion": "2.9.0.0",
   "parameters": {
     "allowUsageAnalytics": {
       "value": true
     },
     "artifactLocation": {
-      "value": "f5-azure-arm-templates-v2/v2.8.0.0/examples/"
+      "value": "f5-azure-arm-templates-v2/v2.9.0.0/examples/"
     },
     "bigIpImage": {
       "value": "f5-networks:f5-big-ip-byol:f5-big-all-2slot-byol:16.1.303000"
@@ -27,10 +27,10 @@
       "value": 0
     },
     "bigIpRuntimeInitConfig": {
-      "value": "https://raw.githubusercontent.com/F5Networks/f5-azure-arm-templates-v2/v2.8.0.0/examples/autoscale/bigip-configurations/runtime-init-conf-bigiq-with-app.yaml"
+      "value": "https://raw.githubusercontent.com/F5Networks/f5-azure-arm-templates-v2/v2.9.0.0/examples/autoscale/bigip-configurations/runtime-init-conf-bigiq-with-app.yaml"
     },
     "bigIpRuntimeInitPackageUrl": {
-      "value": "https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v1.6.1/dist/f5-bigip-runtime-init-1.6.1-1.gz.run"
+      "value": "https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v1.6.2/dist/f5-bigip-runtime-init-1.6.2-1.gz.run"
     },
     "bigIpScaleInCpuThreshold": {
       "value": 20

diff --git a/examples/autoscale/bigiq/azuredeploy.json b/examples/autoscale/bigiq/azuredeploy.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
-  "contentVersion": "2.8.0.0",
+  "contentVersion": "2.9.0.0",
   "parameters": {
     "templateBaseUrl": {
       "defaultValue": "https://cdn.f5.com/product/cloudsolutions/",
@@ -68,14 +68,14 @@
       "type": "string"
     },
     "bigIpRuntimeInitConfig": {
-      "defaultValue": "https://raw.githubusercontent.com/F5Networks/f5-azure-arm-templates-v2/v2.8.0.0/examples/autoscale/bigip-configurations/runtime-init-conf-bigiq-with-app.yaml",
+      "defaultValue": "https://raw.githubusercontent.com/F5Networks/f5-azure-arm-templates-v2/v2.9.0.0/examples/autoscale/bigip-configurations/runtime-init-conf-bigiq-with-app.yaml",
       "metadata": {
         "description": "Supply a URL to the bigip-runtime-init configuration file in YAML or JSON format, or an escaped JSON string to use for f5-bigip-runtime-init configuration."
       },
       "type": "string"
     },
     "bigIpRuntimeInitPackageUrl": {
-      "defaultValue": "https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v1.6.1/dist/f5-bigip-runtime-init-1.6.1-1.gz.run",
+      "defaultValue": "https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v1.6.2/dist/f5-bigip-runtime-init-1.6.2-1.gz.run",
       "metadata": {
         "description": "URL for BIG-IP Runtime Init package"
       },

diff --git a/examples/autoscale/bigiq/azuredeploy.parameters.json b/examples/autoscale/bigiq/azuredeploy.parameters.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
-  "contentVersion": "2.8.0.0",
+  "contentVersion": "2.9.0.0",
   "parameters": {
     "allowUsageAnalytics": {
       "value": true
@@ -15,7 +15,7 @@
       "value": 1
     },
     "artifactLocation": {
-      "value": "f5-azure-arm-templates-v2/v2.8.0.0/examples/"
+      "value": "f5-azure-arm-templates-v2/v2.9.0.0/examples/"
     },
     "bigIpImage": {
       "value": "f5-networks:f5-big-ip-byol:f5-big-all-2slot-byol:16.1.303000"
@@ -36,10 +36,10 @@
       "value": 0
     },
     "bigIpRuntimeInitConfig": {
-      "value": "https://raw.githubusercontent.com/F5Networks/f5-azure-arm-templates-v2/v2.8.0.0/examples/autoscale/bigip-configurations/runtime-init-conf-bigiq-with-app.yaml"
+      "value": "https://raw.githubusercontent.com/F5Networks/f5-azure-arm-templates-v2/v2.9.0.0/examples/autoscale/bigip-configurations/runtime-init-conf-bigiq-with-app.yaml"
     },
     "bigIpRuntimeInitPackageUrl": {
-      "value": "https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v1.6.1/dist/f5-bigip-runtime-init-1.6.1-1.gz.run"
+      "value": "https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v1.6.2/dist/f5-bigip-runtime-init-1.6.2-1.gz.run"
     },
     "bigIpScaleInCpuThreshold": {
       "value": 20