Skip to content

[WIP - Do not merge] feat: update bigip images to latest #307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
+158 −177
Open

[WIP - Do not merge] feat: update bigip images to latest #307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9897068
feat: update bigip images to latest
argeiger Mar 23, 2023
e9f62b8
feat: update bigip images to latest
argeiger Mar 23, 2023
96735f6
feat: update bigip images to latest
argeiger Mar 23, 2023
bd308c7
Merge branch 'main' into f5-images-update
ocofaigh Mar 28, 2023
0e8dffd
ci: rebase and fix failing hooks
ocofaigh Apr 12, 2023
4455ec3
ci: rebase and merge
ocofaigh Apr 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .secrets.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"files": "go.sum|^.secrets.baseline$",
"lines": null
},
"generated_at": "2023-04-06T14:59:53Z",
"generated_at": "2023-04-12T09:17:35Z",
"plugins_used": [
{
"name": "AWSKeyDetector"
Expand Down
107 changes: 45 additions & 62 deletions f5_vsi.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,28 +17,6 @@ locals {
# List of public images found in F5 schematics documentation
# (https://github.com/f5devcentral/ibmcloud_schematics_bigip_multinic_public_images)
public_image_map = {
f5-bigip-15-1-5-1-0-0-14-all-1slot = {
"eu-de" = "r010-b14deae9-43fd-4850-b89d-5d6485d61acb"
"jp-tok" = "r022-cfdb6280-c200-4261-af3a-a8d44bbd18ba"
"br-sao" = "r042-3915f0e3-aadc-4fc9-95a8-840f8cb163de"
"au-syd" = "r026-ed57accf-b3d4-4ca9-a6a6-e0a63ee1aba4"
"us-south" = "r006-c9f07041-bb56-4492-b25c-5f407ebea358"
"eu-gb" = "r018-6dce329f-a6eb-4146-ba3e-5560afc84aa1"
"jp-osa" = "r034-4ecc10ff-3dc7-42fb-9cae-189fb559dd61"
"us-east" = "r014-87371e4c-3645-4579-857c-7e02fe5e9ff4"
"ca-tor" = "r038-0840034f-5d05-4a6d-bdae-123628f1d323"
}
f5-bigip-15-1-5-1-0-0-14-ltm-1slot = {
"eu-de" = "r010-efad005b-4deb-45a8-b1c5-5b3cea55e7e3"
"jp-tok" = "r022-35126a90-aec2-4934-a628-d1ce90bcf68a"
"br-sao" = "r042-978cecaf-7f2a-44bc-bffd-ddcf6ce56b11"
"au-syd" = "r026-429369e1-d917-4d9c-8a8c-3a8606e26a72"
"us-south" = "r006-afe3c555-e8ba-4448-9983-151a14edf868"
"eu-gb" = "r018-f2083d86-6f25-42d6-b66a-d5ed2a0108d2"
"jp-osa" = "r034-edd01010-b7ee-411c-9158-d41960bf9def"
"us-east" = "r014-41db5a03-ab7f-4bf7-95c2-8edbeea0e3af"
"ca-tor" = "r038-f5d750b1-61dc-4fa5-98d3-a790417f07dd"
}
f5-bigip-16-1-2-2-0-0-28-ltm-1slot = {
"eu-de" = "r010-c90f3597-d03e-4ce6-8efa-870c782952cd"
"jp-tok" = "r022-0da3fc1b-c243-4702-87cc-b5a7f5e1f035"
Expand All @@ -61,49 +39,54 @@ locals {
"us-east" = "r014-015d6b06-611e-4e1a-9284-551ed3832182"
"ca-tor" = "r038-b7a44268-e95f-425b-99ac-6ec5fc2c4cdc"
},
f5-bigip-16-1-3-2-0-0-4-ltm-1slot = {
"eu-de" = "r010-d38b9af9-b345-40e6-8d7a-34cdfb7ffef9"
"jp-tok" = "r022-4dc47d5a-a8eb-4e85-8bda-928db1067354"
"br-sao" = "r042-28930d14-46ab-4784-b2f4-e56d0e4eddfc"
"au-syd" = "r026-c9f7699f-9e06-4802-a3a3-3b03ef429c04"
"us-south" = "r006-301cece1-59cf-4e71-a0e2-6be355b692b5"
"eu-gb" = "r018-34c9cfcc-84d6-431a-9e92-f523c6705742"
"jp-osa" = "r034-18e41455-9c8c-4ecf-8264-ff2070a76610"
"us-east" = "r014-7f427b96-c39d-40f7-8f06-2da6e4c63250"
"ca-tor" = "r038-aeeb05de-061e-40e2-b176-827d343de934"
f5-bigip-16-1-3-3-0-0-3-all-1slot = {
"eu-de" = "r010-df45998a-7c98-40ae-9b25-e908331fb76a"
"jp-tok" = "r022-cc145b83-92d2-4129-b311-bd2b78fb2172"
"br-sao" = "r042-445d3dbf-f516-4213-9a78-0bfc0b540d05"
"au-syd" = "r026-1d361ae2-35dd-4ff3-a7b8-93f26614fe52"
"us-south" = "r006-30804d17-d907-4ca9-9167-4fa7e75bc511"
"eu-gb" = "r018-0d4f8035-c26a-48b1-93b3-ec970e47cf40"
"jp-osa" = "r034-a22aceff-5f2e-4837-880c-d4576303e21f"
"us-east" = "r014-b236bd8f-2253-4606-ac51-a7fa1dadafae"
"eu-fr2" = "r030-13ff5014-3589-491f-915a-72368b7f6566"
"ca-tor" = "r038-7fa7a5b3-859a-4abc-ab97-f2d7203b4a5d"
},
f5-bigip-16-1-3-2-0-0-4-all-1slot = {
"eu-de" = "r010-92ba59fd-36b1-4ca5-a7c1-4581d10eed3a"
"jp-tok" = "r022-32b33469-1b9d-49eb-8304-b287463849aa"
"br-sao" = "r042-5195b226-d799-415d-99e2-61868995a825"
"au-syd" = "r026-495c8dc6-f8e1-4df8-bcdd-98824f3673e5"
"us-south" = "r006-51cd6c1d-60db-4bb4-8fd8-675a49403246"
"eu-gb" = "r018-7d2d2177-6e4b-4f57-9896-bd95077f2394"
"jp-osa" = "r034-efd9e396-046d-4f55-b452-d467a3183ab4"
"us-east" = "r014-0d1f83ba-54a3-48de-904c-f4806e03ebde"
"ca-tor" = "r038-d9e0b718-1b84-45ef-b603-45a00a768656"
f5-bigip-16-1-3-3-0-0-3-ltm-1slot = {
"eu-de" = "r010-78bd2415-d791-45a6-91b4-24e069ef63bd"
"jp-tok" = "r022-b93a6ccc-59e7-47dc-b9e4-f9a5a2ee93d1"
"br-sao" = "r042-3f2eaa4c-8417-4670-8974-d434612c765a"
"au-syd" = "r026-0cf76d10-db18-499f-86a5-5905ac612da4"
"us-south" = "r006-09fa4dd7-1a7f-453c-a15e-53cf6effbda6"
"eu-gb" = "r018-8b8ea452-b51c-4b20-a16a-403aea05a745"
"jp-osa" = "r034-7ef8a732-a7f1-48d9-a13e-ad6588e74c72"
"us-east" = "r014-b28c4e45-0327-4e25-8bbc-5f48ae2c8e68"
"eu-fr2" = "r030-a1826148-e6d6-47e1-bab0-7b261cd23ae5"
"ca-tor" = "r038-b4856c18-f700-40d5-b574-bd55fb95bbbf"
},
f5-bigip-17-0-0-1-0-0-4-ltm-1slot = {
"eu-de" = "r010-6e13ce99-e218-4837-b77a-b1a097cdb8be"
"jp-tok" = "r022-1a81f5b9-f178-46d6-9546-f6222f51ac09"
"br-sao" = "r042-0aa78ebd-3629-4f71-a225-d057ed910b19"
"au-syd" = "r026-ad311315-1cbf-4e38-b4da-334115ec5777"
"us-south" = "r006-612682f9-b709-41f2-a000-7c7583d6a79b"
"eu-gb" = "r018-58ac90dd-4ab6-4580-899b-ccb7a6cb0486"
"jp-osa" = "r034-d735d37d-90f3-4a5c-9318-320630cfcb8d"
"us-east" = "r014-538006c7-99b2-40ae-bb56-98626510b59c"
"ca-tor" = "r038-cc51e1d4-f29f-40d9-b45d-1fe93dd7bf25"

f5-bigip-17-0-0-2-0-0-2-ltm-1slot = {
"eu-de" = "r010-8927cbf1-bd81-4586-bba3-10949f8b77cb"
"jp-tok" = "r022-6fa37b30-e912-41e2-95ba-49c12e0a8d65"
"br-sao" = "r042-d24cc495-1bcd-4916-858f-8834619f16e2"
"au-syd" = "r026-0614e6ee-aec3-4cdc-9c48-c2757f3fcfb3"
"us-south" = "r006-493db1ca-0b14-45e8-a222-69b9d0863a76"
"eu-gb" = "r018-a54d67dd-90c1-4983-bf93-258babf1ba44"
"jp-osa" = "r034-0625faf6-dec7-4429-98ba-7e2bbf4ed08e"
"us-east" = "r014-c6f1f733-5c37-4b6f-afb6-270af44b2247"
"eu-fr2" = "r030-b3f84f0b-fc46-4996-a52b-3c4006a9f835"
"ca-tor" = "r038-6e3b58fd-cb3e-4fef-8882-dd0164d9e8aa"
},
f5-bigip-17-0-0-1-0-0-4-all-1slot = {
"eu-de" = "r010-9920ae90-8a5a-4d6e-bb39-8e124cfb6b36"
"jp-tok" = "r022-9c278b7c-a74e-4db9-a037-af6ddff94fc5"
"br-sao" = "r042-9d99efd6-eec5-45bd-90b5-51b095ff9347"
"au-syd" = "r026-f75351ef-86b2-4966-82f0-5de9e38e2b04"
"us-south" = "r006-7256a080-1a1b-415e-a449-9fc0fb40e209"
"eu-gb" = "r018-b4db281f-c397-4e15-92b5-3e9b17014815"
"jp-osa" = "r034-dbad3304-d79b-42ec-8c05-b210c21f6840"
"us-east" = "r014-f424a008-2778-484a-89e2-8ca0146fbc74"
"ca-tor" = "r038-269cb902-3aa1-4fc2-b59e-e050af80baac"
f5-bigip-17-0-0-2-0-0-2-all-1slot = {
"eu-de" = "r010-33e49d35-0df8-4dc9-a247-56ecce82b986"
"jp-tok" = "r022-f72249df-075b-4cf3-9969-2acf80298b4c"
"br-sao" = "r042-e09ac580-af33-4eb3-9343-64f4732d69eb"
"au-syd" = "r026-4f01da0c-17a8-48d6-85b1-daeb21c436f7"
"us-south" = "r006-19fada8f-8dcd-4c27-afe9-1cc77bcd6ceb"
"eu-gb" = "r018-30ab931f-371b-4424-b34d-dfc25341f523"
"jp-osa" = "r034-c9d1a792-85b2-4c01-89be-98f63af3cc97"
"us-east" = "r014-4e8014e2-9133-4034-8035-a4913c15ae59"
"eu-fr2" = "r030-1e803de2-1ae6-4624-b467-31dbbb69c150"
"ca-tor" = "r038-8ceba776-b7e7-4ce4-b805-cd059a24037b"
}
}
}
Expand Down
12 changes: 6 additions & 6 deletions module-metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
],
"pos": {
"filename": "variables.tf",
"line": 1518
"line": 1516
}
},
"appid": {
Expand Down Expand Up @@ -112,7 +112,7 @@
],
"pos": {
"filename": "variables.tf",
"line": 1365
"line": 1363
}
},
"f5_vsi": {
Expand Down Expand Up @@ -297,7 +297,7 @@
],
"pos": {
"filename": "variables.tf",
"line": 1411
"line": 1409
}
},
"security_compliance_center": {
Expand All @@ -318,7 +318,7 @@
],
"pos": {
"filename": "variables.tf",
"line": 1427
"line": 1425
}
},
"security_groups": {
Expand Down Expand Up @@ -478,7 +478,7 @@
],
"pos": {
"filename": "variables.tf",
"line": 1486
"line": 1484
}
},
"vpcs": {
Expand Down Expand Up @@ -2243,7 +2243,7 @@
},
"pos": {
"filename": "f5_vsi.tf",
"line": 118
"line": 101
}
},
"key_management": {
Expand Down
6 changes: 3 additions & 3 deletions patterns/dynamic_values/config_modules/f5_deployments/f5_deployments.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@ variable "f5_network_tiers" {
}

variable "f5_image_name" {
description = "Image name for f5 deployments. Must be null or one of `f5-bigip-15-1-5-1-0-0-14-all-1slot`,`f5-bigip-15-1-5-1-0-0-14-ltm-1slot`, `f5-bigip-16-1-2-2-0-0-28-ltm-1slot`,`f5-bigip-16-1-2-2-0-0-28-all-1slot`]."
description = "Image name for f5 deployments. Must be null or one of [`f5-bigip-16-1-2-2-0-0-28-ltm-1slot`,`f5-bigip-16-1-2-2-0-0-28-all-1slot`, `f5-bigip-16-1-3-3-0-0-3-ltm-1slot`, `f5-bigip-16-1-3-3-0-0-3-all-1slot`, `f5-bigip-17-0-0-2-0-0-2-ltm-1slot`, `f5-bigip-17-0-0-2-0-0-2-all-1slot`]."
type = string

validation {
error_message = "Invalid F5 image name. Must be null or one of `f5-bigip-15-1-5-1-0-0-14-all-1slot`,`f5-bigip-15-1-5-1-0-0-14-ltm-1slot`, `f5-bigip-16-1-2-2-0-0-28-ltm-1slot`,`f5-bigip-16-1-2-2-0-0-28-all-1slot`,`f5-bigip-16-1-3-2-0-0-4-ltm-1slot`,`f5-bigip-16-1-3-2-0-0-4-all-1slot`,`f5-bigip-17-0-0-1-0-0-4-ltm-1slot`,`f5-bigip-17-0-0-1-0-0-4-all-1slot`]."
condition = var.f5_image_name == null ? true : contains(["f5-bigip-15-1-5-1-0-0-14-all-1slot", "f5-bigip-15-1-5-1-0-0-14-ltm-1slot", "f5-bigip-16-1-2-2-0-0-28-ltm-1slot", "f5-bigip-16-1-2-2-0-0-28-all-1slot", "f5-bigip-16-1-3-2-0-0-4-ltm-1slot", "f5-bigip-16-1-3-2-0-0-4-all-1slot", "f5-bigip-17-0-0-1-0-0-4-ltm-1slot", "f5-bigip-17-0-0-1-0-0-4-all-1slot"], var.f5_image_name)
error_message = "Invalid F5 image name. Must be null or one of [`f5-bigip-16-1-2-2-0-0-28-ltm-1slot`,`f5-bigip-16-1-2-2-0-0-28-all-1slot`, `f5-bigip-16-1-3-3-0-0-3-ltm-1slot`, `f5-bigip-16-1-3-3-0-0-3-all-1slot`, `f5-bigip-17-0-0-2-0-0-2-ltm-1slot`, `f5-bigip-17-0-0-2-0-0-2-all-1slot`]."
condition = var.f5_image_name == null ? true : contains(["f5-bigip-16-1-2-2-0-0-28-ltm-1slot", "f5-bigip-16-1-2-2-0-0-28-all-1slot", "f5-bigip-16-1-3-3-0-0-3-ltm-1slot", "f5-bigip-16-1-3-3-0-0-3-all-1slot", "f5-bigip-17-0-0-2-0-0-2-ltm-1slot", "f5-bigip-17-0-0-2-0-0-2-all-1slot"], var.f5_image_name)
}
}

Expand Down
8 changes: 4 additions & 4 deletions patterns/dynamic_values/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,13 +159,13 @@ variable "vpn_firewall_type" {
}

variable "f5_image_name" {
description = "Image name for f5 deployments. Must be null or one of `f5-bigip-15-1-5-1-0-0-14-all-1slot`,`f5-bigip-15-1-5-1-0-0-14-ltm-1slot`, `f5-bigip-16-1-2-2-0-0-28-ltm-1slot`,`f5-bigip-16-1-2-2-0-0-28-all-1slot`]."
description = "Image name for f5 deployments. Must be null or one of [`f5-bigip-16-1-2-2-0-0-28-ltm-1slot`,`f5-bigip-16-1-2-2-0-0-28-all-1slot`, `f5-bigip-16-1-3-3-0-0-3-ltm-1slot`, `f5-bigip-16-1-3-3-0-0-3-all-1slot`, `f5-bigip-17-0-0-2-0-0-2-ltm-1slot`, `f5-bigip-17-0-0-2-0-0-2-all-1slot`]."
type = string
default = "f5-bigip-17-0-0-1-0-0-4-all-1slot"
default = "f5-bigip-16-1-3-3-0-0-3-all-1slot"

validation {
error_message = "Invalid F5 image name. Must be null or one of `f5-bigip-15-1-5-1-0-0-14-all-1slot`,`f5-bigip-15-1-5-1-0-0-14-ltm-1slot`, `f5-bigip-16-1-2-2-0-0-28-ltm-1slot`,`f5-bigip-16-1-2-2-0-0-28-all-1slot`,`f5-bigip-16-1-3-2-0-0-4-ltm-1slot`,`f5-bigip-16-1-3-2-0-0-4-all-1slot`,`f5-bigip-17-0-0-1-0-0-4-ltm-1slot`,`f5-bigip-17-0-0-1-0-0-4-all-1slot`]."
condition = var.f5_image_name == null ? true : contains(["f5-bigip-15-1-5-1-0-0-14-all-1slot", "f5-bigip-15-1-5-1-0-0-14-ltm-1slot", "f5-bigip-16-1-2-2-0-0-28-ltm-1slot", "f5-bigip-16-1-2-2-0-0-28-all-1slot", "f5-bigip-16-1-3-2-0-0-4-ltm-1slot", "f5-bigip-16-1-3-2-0-0-4-all-1slot", "f5-bigip-17-0-0-1-0-0-4-ltm-1slot", "f5-bigip-17-0-0-1-0-0-4-all-1slot"], var.f5_image_name)
error_message = "Invalid F5 image name. Must be null or one of [`f5-bigip-16-1-2-2-0-0-28-ltm-1slot`,`f5-bigip-16-1-2-2-0-0-28-all-1slot`, `f5-bigip-16-1-3-3-0-0-3-ltm-1slot`, `f5-bigip-16-1-3-3-0-0-3-all-1slot`, `f5-bigip-17-0-0-2-0-0-2-ltm-1slot`, `f5-bigip-17-0-0-2-0-0-2-all-1slot`]."
condition = var.f5_image_name == null ? true : contains(["f5-bigip-16-1-2-2-0-0-28-ltm-1slot", "f5-bigip-16-1-2-2-0-0-28-all-1slot", "f5-bigip-16-1-3-3-0-0-3-ltm-1slot", "f5-bigip-16-1-3-3-0-0-3-all-1slot", "f5-bigip-17-0-0-2-0-0-2-ltm-1slot", "f5-bigip-17-0-0-2-0-0-2-all-1slot"], var.f5_image_name)
}
}

Expand Down
Loading