Skip to content

Commit 9cbc797

Browse files
authored
feat: added support for OCP 4.19 (#840)
1 parent 17585fc commit 9cbc797

File tree

3 files changed

+18
-8
lines changed

3 files changed

+18
-8
lines changed

ibm_catalog.json

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,12 @@
257257
{
258258
"key": "openshift_version",
259259
"required": true,
260-
"default_value": "4.18",
260+
"default_value": "4.19",
261261
"options": [
262+
{
263+
"displayname": "4.19",
264+
"value": "4.19"
265+
},
262266
{
263267
"displayname": "4.18",
264268
"value": "4.18"
@@ -1467,9 +1471,13 @@
14671471
},
14681472
{
14691473
"key": "openshift_version",
1470-
"default_value": "4.18",
1474+
"default_value": "4.19",
14711475
"required": true,
14721476
"options": [
1477+
{
1478+
"displayname": "4.19",
1479+
"value": "4.19"
1480+
},
14731481
{
14741482
"displayname": "4.18",
14751483
"value": "4.18"

tests/pr_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ const resourceGroup = "geretain-test-base-ocp-vpc"
3131
const yamlLocation = "../common-dev-assets/common-go-assets/common-permanent-resources.yaml"
3232

3333
// Ensure there is one test per supported OCP version
34-
const ocpVersion1 = "4.18" // used by TestRunFullyConfigurable, TestRunUpgradeFullyConfigurable, TestFSCloudInSchematic and TestRunMultiClusterExample
35-
const ocpVersion2 = "4.17" // used by TestCustomSGExample and TestRunCustomsgExample
36-
const ocpVersion3 = "4.16" // used by TestRunAdvancedExample and TestCrossKmsSupportExample
37-
const ocpVersion4 = "4.15" // used by TestRunAddRulesToSGExample and TestRunBasicExample
34+
const ocpVersion1 = "4.19" // used by TestRunFullyConfigurable, TestRunUpgradeFullyConfigurable, TestFSCloudInSchematic and TestRunMultiClusterExample
35+
const ocpVersion2 = "4.18" // used by TestCustomSGExample and TestRunCustomsgExample
36+
const ocpVersion3 = "4.17" // used by TestRunAdvancedExample and TestCrossKmsSupportExample
37+
const ocpVersion4 = "4.16" // used by TestRunAddRulesToSGExample and TestRunBasicExample
3838
const terraformVersion = "terraform_v1.10" // This should match the version in the ibm_catalog.json
3939

4040
var (

variables.tf

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,10 @@ variable "worker_pools" {
107107
(local.ocp_version_num == "4.14" && wp.operating_system == local.os_rhel) ||
108108
(local.ocp_version_num == "4.15" && contains([local.os_rhel, local.os_rhcos], wp.operating_system)) ||
109109
(contains(["4.16", "4.17"], local.ocp_version_num) && contains([local.os_rhel9, local.os_rhel, local.os_rhcos], wp.operating_system)) ||
110-
(local.ocp_version_num == "4.18" && contains([local.os_rhel9, local.os_rhcos], wp.operating_system))
110+
(local.ocp_version_num == "4.18" && contains([local.os_rhel9, local.os_rhcos], wp.operating_system)) ||
111+
(local.ocp_version_num == "4.19" && contains([local.os_rhel9, local.os_rhcos], wp.operating_system))
111112
])
112-
error_message = "Invalid operating system for the given OCP version. Ensure the OS is compatible with the OCP version. Supported compatible OCP version and OS are v4.14: (REDHAT_8_64); v4.15: (REDHAT_8_64, RHCOS) ; v4.16 and v4.17: (REDHAT_8_64, RHCOS, RHEL_9_64); v4.18: (RHCOS, RHEL_9_64)"
113+
error_message = "Invalid operating system for the given OCP version. Ensure the OS is compatible with the OCP version. Supported compatible OCP version and OS are v4.14: (REDHAT_8_64); v4.15: (REDHAT_8_64, RHCOS) ; v4.16 and v4.17: (REDHAT_8_64, RHCOS, RHEL_9_64); v4.18: (RHCOS, RHEL_9_64); v4.19: (RHEL_9_64, RHCOS)"
113114
}
114115

115116
validation {
@@ -196,6 +197,7 @@ variable "ocp_version" {
196197
var.ocp_version == "4.16",
197198
var.ocp_version == "4.17",
198199
var.ocp_version == "4.18",
200+
var.ocp_version == "4.19",
199201
])
200202
error_message = "The specified ocp_version is not of the valid versions."
201203
}

0 commit comments

Comments
 (0)