Skip to content

Commit

Permalink
Merge branch 'release-24-06' into 'main'
Browse files Browse the repository at this point in the history
Release 24 06

See merge request cloudsolutions/automation-templates/f5-azure-arm-templates-v2!151
  • Loading branch information
mikeshimkus committed Jun 7, 2024
2 parents 0c17774 + 12467b3 commit 342c2b3
Show file tree
Hide file tree
Showing 84 changed files with 306 additions and 306 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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/v2.0.1/dist/f5-bigip-runtime-init-2.0.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/v2.0.2/dist/f5-bigip-runtime-init-2.0.2-1.gz.run --cloud azure

run_parameter_generator:
echo "Generating v2 input parameters files"
Expand Down
2 changes: 1 addition & 1 deletion cloud-tools
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,11 @@ bigip_ready_enabled: []
extension_packages:
install_operations:
- extensionType: do
extensionVersion: 1.43.0
extensionHash: 394f6d97219d016e90016874acb09bd27f7907fda4f1730dea0276900b753a1d
extensionVersion: 1.44.0
extensionHash: 3b05d9bcafbcf0b5b625ff81d6bab5ad26ed90c0dd202ded51756af3598a97ec
- extensionType: as3
extensionVersion: 3.50.2
extensionHash: 620f441bebfdce0261045e34bc7c34f2793b05c0aca62c7ec8e22bbb3f4f35c3
extensionVersion: 3.51.0
extensionHash: e151a9ccd0fd60c359f31839dc3a70bfcf2b46b9fedb8e1c37e67255ee482c0f
- extensionType: ts
extensionVersion: 1.35.0
extensionHash: 839698d98a8651a90b3d509cde4b382338461a253878c9fd00c894699ef0e844
Expand Down Expand Up @@ -199,7 +199,7 @@ extension_services:
Custom_WAF_Policy:
class: WAF_Policy
url: >-
https://raw.githubusercontent.com/F5Networks/f5-azure-arm-templates-v2/v3.1.0.0/examples/autoscale/bigip-configurations/Rapid_Deployment_Policy_13_1.xml
https://raw.githubusercontent.com/F5Networks/f5-azure-arm-templates-v2/v3.2.0.0/examples/autoscale/bigip-configurations/Rapid_Deployment_Policy_13_1.xml
enforcementMode: blocking
ignoreChanges: false
HTTP_Service:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ bigip_ready_enabled: []
extension_packages:
install_operations:
- extensionType: do
extensionVersion: 1.43.0
extensionHash: 394f6d97219d016e90016874acb09bd27f7907fda4f1730dea0276900b753a1d
extensionVersion: 1.44.0
extensionHash: 3b05d9bcafbcf0b5b625ff81d6bab5ad26ed90c0dd202ded51756af3598a97ec
- extensionType: as3
extensionVersion: 3.50.2
extensionHash: 620f441bebfdce0261045e34bc7c34f2793b05c0aca62c7ec8e22bbb3f4f35c3
extensionVersion: 3.51.0
extensionHash: e151a9ccd0fd60c359f31839dc3a70bfcf2b46b9fedb8e1c37e67255ee482c0f
- extensionType: ts
extensionVersion: 1.35.0
extensionHash: 839698d98a8651a90b3d509cde4b382338461a253878c9fd00c894699ef0e844
Expand Down Expand Up @@ -172,7 +172,7 @@ extension_services:
Custom_WAF_Policy:
class: WAF_Policy
url: >-
https://raw.githubusercontent.com/F5Networks/f5-azure-arm-templates-v2/v3.1.0.0/examples/autoscale/bigip-configurations/Rapid_Deployment_Policy_13_1.xml
https://raw.githubusercontent.com/F5Networks/f5-azure-arm-templates-v2/v3.2.0.0/examples/autoscale/bigip-configurations/Rapid_Deployment_Policy_13_1.xml
enforcementMode: blocking
ignoreChanges: false
HTTP_Service:
Expand Down
14 changes: 7 additions & 7 deletions examples/autoscale/bigiq/README.md

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions examples/autoscale/bigiq/azuredeploy-existing-network.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
"contentVersion": "3.1.0.0",
"contentVersion": "3.2.0.0",
"parameters": {
"templateBaseUrl": {
"defaultValue": "https://cdn.f5.com/product/cloudsolutions/",
Expand Down Expand Up @@ -75,14 +75,14 @@
"type": "string"
},
"bigIpRuntimeInitConfig": {
"defaultValue": "https://raw.githubusercontent.com/F5Networks/f5-azure-arm-templates-v2/v3.1.0.0/examples/autoscale/bigip-configurations/runtime-init-conf-bigiq-with-app.yaml",
"defaultValue": "https://raw.githubusercontent.com/F5Networks/f5-azure-arm-templates-v2/v3.2.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/v2.0.1/dist/f5-bigip-runtime-init-2.0.1-1.gz.run",
"defaultValue": "https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.2/dist/f5-bigip-runtime-init-2.0.2-1.gz.run",
"metadata": {
"description": "URL for BIG-IP Runtime Init package"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
"contentVersion": "3.1.0.0",
"contentVersion": "3.2.0.0",
"parameters": {
"allowUsageAnalytics": {
"value": true
},
"artifactLocation": {
"value": "f5-azure-arm-templates-v2/v3.1.0.0/examples/"
"value": "f5-azure-arm-templates-v2/v3.2.0.0/examples/"
},
"bigIpImage": {
"value": "f5-networks:f5-big-ip-byol:f5-big-all-2slot-byol:17.1.100002"
Expand All @@ -27,10 +27,10 @@
"value": 0
},
"bigIpRuntimeInitConfig": {
"value": "https://raw.githubusercontent.com/F5Networks/f5-azure-arm-templates-v2/v3.1.0.0/examples/autoscale/bigip-configurations/runtime-init-conf-bigiq-with-app.yaml"
"value": "https://raw.githubusercontent.com/F5Networks/f5-azure-arm-templates-v2/v3.2.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/v2.0.1/dist/f5-bigip-runtime-init-2.0.1-1.gz.run"
"value": "https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.2/dist/f5-bigip-runtime-init-2.0.2-1.gz.run"
},
"bigIpScaleInCpuThreshold": {
"value": 20
Expand Down
6 changes: 3 additions & 3 deletions examples/autoscale/bigiq/azuredeploy.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
"contentVersion": "3.1.0.0",
"contentVersion": "3.2.0.0",
"parameters": {
"templateBaseUrl": {
"defaultValue": "https://cdn.f5.com/product/cloudsolutions/",
Expand Down Expand Up @@ -68,14 +68,14 @@
"type": "string"
},
"bigIpRuntimeInitConfig": {
"defaultValue": "https://raw.githubusercontent.com/F5Networks/f5-azure-arm-templates-v2/v3.1.0.0/examples/autoscale/bigip-configurations/runtime-init-conf-bigiq-with-app.yaml",
"defaultValue": "https://raw.githubusercontent.com/F5Networks/f5-azure-arm-templates-v2/v3.2.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/v2.0.1/dist/f5-bigip-runtime-init-2.0.1-1.gz.run",
"defaultValue": "https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.2/dist/f5-bigip-runtime-init-2.0.2-1.gz.run",
"metadata": {
"description": "URL for BIG-IP Runtime Init package"
},
Expand Down
8 changes: 4 additions & 4 deletions examples/autoscale/bigiq/azuredeploy.parameters.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
"contentVersion": "3.1.0.0",
"contentVersion": "3.2.0.0",
"parameters": {
"allowUsageAnalytics": {
"value": true
Expand All @@ -15,7 +15,7 @@
"value": 1
},
"artifactLocation": {
"value": "f5-azure-arm-templates-v2/v3.1.0.0/examples/"
"value": "f5-azure-arm-templates-v2/v3.2.0.0/examples/"
},
"bigIpImage": {
"value": "f5-networks:f5-big-ip-byol:f5-big-all-2slot-byol:17.1.100002"
Expand All @@ -36,10 +36,10 @@
"value": 0
},
"bigIpRuntimeInitConfig": {
"value": "https://raw.githubusercontent.com/F5Networks/f5-azure-arm-templates-v2/v3.1.0.0/examples/autoscale/bigip-configurations/runtime-init-conf-bigiq-with-app.yaml"
"value": "https://raw.githubusercontent.com/F5Networks/f5-azure-arm-templates-v2/v3.2.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/v2.0.1/dist/f5-bigip-runtime-init-2.0.1-1.gz.run"
"value": "https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.2/dist/f5-bigip-runtime-init-2.0.2-1.gz.run"
},
"bigIpScaleInCpuThreshold": {
"value": 20
Expand Down
Loading

0 comments on commit 342c2b3

Please sign in to comment.