Skip to content

Commit 30bc9ea

Browse files
argeigerargeiger
authored
feat: support new versions of f5 image (#197)
1 parent 62d6eb9 commit 30bc9ea

File tree

8 files changed

+72
-24
lines changed

8 files changed

+72
-24
lines changed

‎f5_vsi.tf‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,50 @@ locals {
6060
"jp-osa" = "r034-1b04698d-9935-4477-8f72-958c7f08c85f"
6161
"us-east" = "r014-015d6b06-611e-4e1a-9284-551ed3832182"
6262
"ca-tor" = "r038-b7a44268-e95f-425b-99ac-6ec5fc2c4cdc"
63+
},
64+
f5-bigip-16-1-3-2-0-0-4-ltm-1slot = {
65+
"eu-de" = "r010-d38b9af9-b345-40e6-8d7a-34cdfb7ffef9"
66+
"jp-tok" = "r022-4dc47d5a-a8eb-4e85-8bda-928db1067354"
67+
"br-sao" = "r042-28930d14-46ab-4784-b2f4-e56d0e4eddfc"
68+
"au-syd" = "r026-c9f7699f-9e06-4802-a3a3-3b03ef429c04"
69+
"us-south" = "r006-301cece1-59cf-4e71-a0e2-6be355b692b5"
70+
"eu-gb" = "r018-34c9cfcc-84d6-431a-9e92-f523c6705742"
71+
"jp-osa" = "r034-18e41455-9c8c-4ecf-8264-ff2070a76610"
72+
"us-east" = "r014-7f427b96-c39d-40f7-8f06-2da6e4c63250"
73+
"ca-tor" = "r038-aeeb05de-061e-40e2-b176-827d343de934"
74+
},
75+
f5-bigip-16-1-3-2-0-0-4-all-1slot = {
76+
"eu-de" = "r010-92ba59fd-36b1-4ca5-a7c1-4581d10eed3a"
77+
"jp-tok" = "r022-32b33469-1b9d-49eb-8304-b287463849aa"
78+
"br-sao" = "r042-5195b226-d799-415d-99e2-61868995a825"
79+
"au-syd" = "r026-495c8dc6-f8e1-4df8-bcdd-98824f3673e5"
80+
"us-south" = "r006-51cd6c1d-60db-4bb4-8fd8-675a49403246"
81+
"eu-gb" = "r018-7d2d2177-6e4b-4f57-9896-bd95077f2394"
82+
"jp-osa" = "r034-efd9e396-046d-4f55-b452-d467a3183ab4"
83+
"us-east" = "r014-0d1f83ba-54a3-48de-904c-f4806e03ebde"
84+
"ca-tor" = "r038-d9e0b718-1b84-45ef-b603-45a00a768656"
85+
},
86+
f5-bigip-17-0-0-1-0-0-4-ltm-1slot = {
87+
"eu-de" = "r010-6e13ce99-e218-4837-b77a-b1a097cdb8be"
88+
"jp-tok" = "r022-1a81f5b9-f178-46d6-9546-f6222f51ac09"
89+
"br-sao" = "r042-0aa78ebd-3629-4f71-a225-d057ed910b19"
90+
"au-syd" = "r026-ad311315-1cbf-4e38-b4da-334115ec5777"
91+
"us-south" = "r006-612682f9-b709-41f2-a000-7c7583d6a79b"
92+
"eu-gb" = "r018-58ac90dd-4ab6-4580-899b-ccb7a6cb0486"
93+
"jp-osa" = "r034-d735d37d-90f3-4a5c-9318-320630cfcb8d"
94+
"us-east" = "r014-538006c7-99b2-40ae-bb56-98626510b59c"
95+
"ca-tor" = "r038-cc51e1d4-f29f-40d9-b45d-1fe93dd7bf25"
96+
},
97+
f5-bigip-17-0-0-1-0-0-4-all-1slot = {
98+
"eu-de" = "r010-9920ae90-8a5a-4d6e-bb39-8e124cfb6b36"
99+
"jp-tok" = "r022-9c278b7c-a74e-4db9-a037-af6ddff94fc5"
100+
"br-sao" = "r042-9d99efd6-eec5-45bd-90b5-51b095ff9347"
101+
"au-syd" = "r026-f75351ef-86b2-4966-82f0-5de9e38e2b04"
102+
"us-south" = "r006-7256a080-1a1b-415e-a449-9fc0fb40e209"
103+
"eu-gb" = "r018-b4db281f-c397-4e15-92b5-3e9b17014815"
104+
"jp-osa" = "r034-dbad3304-d79b-42ec-8c05-b210c21f6840"
105+
"us-east" = "r014-f424a008-2778-484a-89e2-8ca0146fbc74"
106+
"ca-tor" = "r038-269cb902-3aa1-4fc2-b59e-e050af80baac"
63107
}
64108
}
65109
}

‎module-metadata.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
],
2626
"pos": {
2727
"filename": "variables.tf",
28-
"line": 1512
28+
"line": 1516
2929
}
3030
},
3131
"appid": {
@@ -111,7 +111,7 @@
111111
],
112112
"pos": {
113113
"filename": "variables.tf",
114-
"line": 1359
114+
"line": 1363
115115
}
116116
},
117117
"f5_vsi": {
@@ -295,7 +295,7 @@
295295
],
296296
"pos": {
297297
"filename": "variables.tf",
298-
"line": 1405
298+
"line": 1409
299299
}
300300
},
301301
"security_compliance_center": {
@@ -316,7 +316,7 @@
316316
],
317317
"pos": {
318318
"filename": "variables.tf",
319-
"line": 1421
319+
"line": 1425
320320
}
321321
},
322322
"security_groups": {
@@ -475,7 +475,7 @@
475475
],
476476
"pos": {
477477
"filename": "variables.tf",
478-
"line": 1480
478+
"line": 1484
479479
}
480480
},
481481
"vpcs": {
@@ -2120,7 +2120,7 @@
21202120
},
21212121
"pos": {
21222122
"filename": "f5_vsi.tf",
2123-
"line": 74
2123+
"line": 118
21242124
}
21252125
},
21262126
"key_management": {

‎patterns/dynamic_values/config_modules/f5_deployments/f5_deployments.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ variable "f5_image_name" {
5050
type = string
5151

5252
validation {
53-
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`]."
54-
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"], var.f5_image_name)
53+
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`]."
54+
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)
5555
}
5656
}
5757

‎patterns/dynamic_values/variables.tf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,11 +143,11 @@ variable "vpn_firewall_type" {
143143
variable "f5_image_name" {
144144
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`]."
145145
type = string
146-
default = "f5-bigip-16-1-2-2-0-0-28-all-1slot"
146+
default = "f5-bigip-17-0-0-1-0-0-4-all-1slot"
147147

148148
validation {
149-
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`]."
150-
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"], var.f5_image_name)
149+
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`]."
150+
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)
151151
}
152152
}
153153

‎patterns/mixed/variables.tf‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -244,13 +244,13 @@ variable "vpn_firewall_type" {
244244
}
245245

246246
variable "f5_image_name" {
247-
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`]."
247+
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`,`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`]."
248248
type = string
249-
default = "f5-bigip-16-1-2-2-0-0-28-all-1slot"
249+
default = "f5-bigip-17-0-0-1-0-0-4-all-1slot"
250250

251251
validation {
252-
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`]."
253-
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"], var.f5_image_name)
252+
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`]."
253+
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)
254254
}
255255
}
256256

‎patterns/roks/variables.tf‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -217,13 +217,13 @@ variable "ssh_public_key" {
217217
}
218218

219219
variable "f5_image_name" {
220-
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`]."
220+
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`,`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`]."
221221
type = string
222-
default = "f5-bigip-16-1-2-2-0-0-28-all-1slot"
222+
default = "f5-bigip-17-0-0-1-0-0-4-all-1slot"
223223

224224
validation {
225-
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`]."
226-
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"], var.f5_image_name)
225+
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`]."
226+
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)
227227
}
228228
}
229229

‎patterns/vsi/variables.tf‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -179,13 +179,13 @@ variable "vpn_firewall_type" {
179179
}
180180

181181
variable "f5_image_name" {
182-
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`]."
182+
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`,`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`]."
183183
type = string
184-
default = "f5-bigip-16-1-2-2-0-0-28-all-1slot"
184+
default = "f5-bigip-17-0-0-1-0-0-4-all-1slot"
185185

186186
validation {
187-
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`]."
188-
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"], var.f5_image_name)
187+
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`]."
188+
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)
189189
}
190190
}
191191

‎variables.tf‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1347,7 +1347,11 @@ variable "f5_vsi" {
13471347
"f5-bigip-15-1-5-1-0-0-14-all-1slot",
13481348
"f5-bigip-15-1-5-1-0-0-14-ltm-1slot",
13491349
"f5-bigip-16-1-2-2-0-0-28-ltm-1slot",
1350-
"f5-bigip-16-1-2-2-0-0-28-all-1slot"
1350+
"f5-bigip-16-1-2-2-0-0-28-all-1slot",
1351+
"f5-bigip-16-1-3-2-0-0-4-ltm-1slot",
1352+
"f5-bigip-16-1-3-2-0-0-4-all-1slot",
1353+
"f5-bigip-17-0-0-1-0-0-4-ltm-1slot",
1354+
"f5-bigip-17-0-0-1-0-0-4-all-1slot"
13511355
],
13521356
f5_vsi.f5_image_name
13531357
)

0 commit comments

Comments
 (0)