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-google-gdm-templates-v2!142
  • Loading branch information
mikeshimkus committed Jun 7, 2024
2 parents ff71d70 + b7ad885 commit 84c9b5a
Show file tree
Hide file tree
Showing 66 changed files with 191 additions and 191 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,4 @@ run_expected_outputs_diff:

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 gcp
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 gcp
2 changes: 1 addition & 1 deletion cloud-tools
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,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
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,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
2 changes: 1 addition & 1 deletion examples/autoscale/bigiq/autoscale-existing-network.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Copyright 2021 F5 Networks All rights reserved.
#
# Version 3.1.0.0
# Version 3.2.0.0

# pylint: disable=W,C,R

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ info:
title: F5 Autoscale WAF BIGIQ template
author: F5 Networks
description: Creates an Autoscale WAF BIGIQ deployment.
version: 3.1.0.0
version: 3.2.0.0

imports:
- path: autoscale-existing-network.py
Expand Down
2 changes: 1 addition & 1 deletion examples/autoscale/bigiq/autoscale.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Copyright 2021 F5 Networks All rights reserved.
#
# Version 3.1.0.0
# Version 3.2.0.0

# pylint: disable=W,C,R

Expand Down
4 changes: 2 additions & 2 deletions examples/autoscale/bigiq/autoscale.py.schema
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ info:
title: F5 Autoscale WAF BIGIQ template
author: F5 Networks
description: Creates an Autoscale WAF BIGIQ deployment.
version: 3.1.0.0
version: 3.2.0.0

imports:
- path: autoscale.py
Expand Down Expand Up @@ -71,7 +71,7 @@ properties:
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:
default: https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.1/dist/f5-bigip-runtime-init-2.0.1-1.gz.run
default: https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.2/dist/f5-bigip-runtime-init-2.0.2-1.gz.run
description: URL for BIG-IP Runtime Init package
type: string
bigIqSecretId:
Expand Down
2 changes: 1 addition & 1 deletion examples/autoscale/bigiq/sample_autoscale.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ resources:
https://raw.githubusercontent.com/F5Networks/f5-google-gdm-templates-v2/v2.9.0.0/examples/autoscale/bigip-configurations/runtime-init-conf-bigiq-with-app.yaml
### (OPTIONAL) Supply a URL for the bigip-runtime-init package.
bigIpRuntimeInitPackageUrl: >-
https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.1/dist/f5-bigip-runtime-init-2.0.1-1.gz.run
https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.2/dist/f5-bigip-runtime-init-2.0.2-1.gz.run
### (OPTIONAL) The name of a public F5 Marketplace image to deploy.
# If you would like to view all available public images, run the following gcloud command:
# gcloud compute images list --project f5-7626-networks-public --filter="name~f5"
Expand Down
2 changes: 1 addition & 1 deletion examples/autoscale/payg/autoscale-existing-network.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Copyright 2021 F5 Networks All rights reserved.
#
# Version 3.1.0.0
# Version 3.2.0.0

# pylint: disable=W,C,R

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ info:
title: F5 Autoscale WAF PAYG template
author: F5 Networks
description: Creates an Autoscale WAF PAYG deployment.
version: 3.1.0.0
version: 3.2.0.0

imports:
- path: autoscale.py
Expand Down
2 changes: 1 addition & 1 deletion examples/autoscale/payg/autoscale.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Copyright 2021 F5 Networks All rights reserved.
#
# Version 3.1.0.0
# Version 3.2.0.0

# pylint: disable=W,C,R

Expand Down
4 changes: 2 additions & 2 deletions examples/autoscale/payg/autoscale.py.schema
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ info:
title: F5 Autoscale WAF PAYG template
author: F5 Networks
description: Creates an Autoscale WAF PAYG deployment.
version: 3.1.0.0
version: 3.2.0.0

imports:
- path: autoscale.py
Expand Down Expand Up @@ -65,7 +65,7 @@ properties:
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:
default: https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.1/dist/f5-bigip-runtime-init-2.0.1-1.gz.run
default: https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.2/dist/f5-bigip-runtime-init-2.0.2-1.gz.run
description: URL for BIG-IP Runtime Init package
type: string
cost:
Expand Down
2 changes: 1 addition & 1 deletion examples/autoscale/payg/sample_autoscale.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ resources:
https://raw.githubusercontent.com/F5Networks/f5-google-gdm-templates-v2/v2.9.0.0/examples/autoscale/bigip-configurations/runtime-init-conf-payg-with-app.yaml
### (OPTIONAL) Supply a URL for the bigip-runtime-init package.
bigIpRuntimeInitPackageUrl: >-
https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.1/dist/f5-bigip-runtime-init-2.0.1-1.gz.run
https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.2/dist/f5-bigip-runtime-init-2.0.2-1.gz.run
### (OPTIONAL) The name of a public F5 Marketplace image to deploy.
# If you would like to view all available public images, run the following gcloud command:
# gcloud compute images list --project f5-7626-networks-public --filter="name~f5"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ controls:
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: cf
extensionVersion: 2.1.0
extensionHash: 8420c72a76b456e0a796dcef9f621ab8b0cf71b751d44f285d48ca92bcd40946
extensionVersion: 2.1.1
extensionHash: c2a23066038e173e857b61c1cf94a7f1530550df5a1e9435da04246f6cb058e7
extension_services:
service_operations:
- extensionType: do
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ controls:
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: cf
extensionVersion: 2.1.0
extensionHash: 8420c72a76b456e0a796dcef9f621ab8b0cf71b751d44f285d48ca92bcd40946
extensionVersion: 2.1.1
extensionHash: c2a23066038e173e857b61c1cf94a7f1530550df5a1e9435da04246f6cb058e7
extension_services:
service_operations:
- extensionType: do
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ controls:
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: cf
extensionVersion: 2.1.0
extensionHash: 8420c72a76b456e0a796dcef9f621ab8b0cf71b751d44f285d48ca92bcd40946
extensionVersion: 2.1.1
extensionHash: c2a23066038e173e857b61c1cf94a7f1530550df5a1e9435da04246f6cb058e7
extension_services:
service_operations:
- extensionType: do
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ controls:
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: cf
extensionVersion: 2.1.0
extensionHash: 8420c72a76b456e0a796dcef9f621ab8b0cf71b751d44f285d48ca92bcd40946
extensionVersion: 2.1.1
extensionHash: c2a23066038e173e857b61c1cf94a7f1530550df5a1e9435da04246f6cb058e7
extension_services:
service_operations:
- extensionType: do
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ controls:
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: cf
extensionVersion: 2.1.0
extensionHash: 8420c72a76b456e0a796dcef9f621ab8b0cf71b751d44f285d48ca92bcd40946
extensionVersion: 2.1.1
extensionHash: c2a23066038e173e857b61c1cf94a7f1530550df5a1e9435da04246f6cb058e7
extension_services:
service_operations:
- extensionType: do
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ controls:
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: cf
extensionVersion: 2.1.0
extensionHash: 8420c72a76b456e0a796dcef9f621ab8b0cf71b751d44f285d48ca92bcd40946
extensionVersion: 2.1.1
extensionHash: c2a23066038e173e857b61c1cf94a7f1530550df5a1e9435da04246f6cb058e7
extension_services:
service_operations:
- extensionType: do
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ controls:
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: cf
extensionVersion: 2.1.0
extensionHash: 8420c72a76b456e0a796dcef9f621ab8b0cf71b751d44f285d48ca92bcd40946
extensionVersion: 2.1.1
extensionHash: c2a23066038e173e857b61c1cf94a7f1530550df5a1e9435da04246f6cb058e7
extension_services:
service_operations:
- extensionType: do
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ controls:
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: cf
extensionVersion: 2.1.0
extensionHash: 8420c72a76b456e0a796dcef9f621ab8b0cf71b751d44f285d48ca92bcd40946
extensionVersion: 2.1.1
extensionHash: c2a23066038e173e857b61c1cf94a7f1530550df5a1e9435da04246f6cb058e7
extension_services:
service_operations:
- extensionType: do
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ controls:
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: cf
extensionVersion: 2.1.0
extensionHash: 8420c72a76b456e0a796dcef9f621ab8b0cf71b751d44f285d48ca92bcd40946
extensionVersion: 2.1.1
extensionHash: c2a23066038e173e857b61c1cf94a7f1530550df5a1e9435da04246f6cb058e7
extension_services:
service_operations:
- extensionType: do
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ controls:
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: cf
extensionVersion: 2.1.0
extensionHash: 8420c72a76b456e0a796dcef9f621ab8b0cf71b751d44f285d48ca92bcd40946
extensionVersion: 2.1.1
extensionHash: c2a23066038e173e857b61c1cf94a7f1530550df5a1e9435da04246f6cb058e7
extension_services:
service_operations:
- extensionType: do
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ controls:
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: cf
extensionVersion: 2.1.0
extensionHash: 8420c72a76b456e0a796dcef9f621ab8b0cf71b751d44f285d48ca92bcd40946
extensionVersion: 2.1.1
extensionHash: c2a23066038e173e857b61c1cf94a7f1530550df5a1e9435da04246f6cb058e7
extension_services:
service_operations:
- extensionType: do
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ controls:
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: cf
extensionVersion: 2.1.0
extensionHash: 8420c72a76b456e0a796dcef9f621ab8b0cf71b751d44f285d48ca92bcd40946
extensionVersion: 2.1.1
extensionHash: c2a23066038e173e857b61c1cf94a7f1530550df5a1e9435da04246f6cb058e7
extension_services:
service_operations:
- extensionType: do
Expand Down
Loading

0 comments on commit 84c9b5a

Please sign in to comment.