Skip to content

Commit 2a6c06e

Browse files
ocofaighocofaigh
authored
feat: Add support for OCP 4.18 and make it the default cluster version (#1026)
1 parent c9c2a0c commit 2a6c06e

File tree

15 files changed

+44
-42
lines changed

15 files changed

+44
-42
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -852,7 +852,7 @@ module "cluster_pattern" {
852852
| Name | Source | Version |
853853
|------|--------|---------|
854854
| <a name="module_bastion_host"></a> [bastion\_host](#module\_bastion\_host) | terraform-ibm-modules/landing-zone-vsi/ibm | 5.1.23 |
855-
| <a name="module_cluster"></a> [cluster](#module\_cluster) | terraform-ibm-modules/base-ocp-vpc/ibm | 3.48.3 |
855+
| <a name="module_cluster"></a> [cluster](#module\_cluster) | terraform-ibm-modules/base-ocp-vpc/ibm | 3.55.0 |
856856
| <a name="module_dynamic_values"></a> [dynamic\_values](#module\_dynamic\_values) | ./dynamic_values | n/a |
857857
| <a name="module_f5_vsi"></a> [f5\_vsi](#module\_f5\_vsi) | terraform-ibm-modules/landing-zone-vsi/ibm | 5.1.23 |
858858
| <a name="module_key_management"></a> [key\_management](#module\_key\_management) | ./kms | n/a |

‎cluster.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ module "cluster" {
244244
if cluster.kube_type == "openshift"
245245
}
246246
source = "terraform-ibm-modules/base-ocp-vpc/ibm"
247-
version = "3.48.3"
247+
version = "3.55.0"
248248
resource_group_id = local.resource_groups[each.value.resource_group]
249249
region = var.region
250250
cluster_name = each.value.cluster_name
@@ -297,7 +297,7 @@ module "cluster" {
297297
disable_public_endpoint = coalesce(each.value.disable_public_endpoint, true) # disable if not set or null
298298
verify_worker_network_readiness = each.value.verify_cluster_network_readiness
299299
use_private_endpoint = each.value.use_ibm_cloud_private_api_endpoints
300-
addons = each.value.addons
300+
addons = { for addon_name, addon_version in each.value.addons : addon_name => { version = addon_version } if addon_version != null }
301301
enable_ocp_console = each.value.enable_ocp_console
302302
manage_all_addons = each.value.manage_all_addons
303303
disable_outbound_traffic_protection = each.value.disable_outbound_traffic_protection

‎dynamic_values/cluster.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ module "ut_cluster_map" {
3737
workers_per_subnet = 2
3838
flavor = "spicy"
3939
secondary_storage = "300gb.5iops-tier"
40-
operating_system = "REDHAT_8_64"
40+
operating_system = "RHCOS"
4141
}
4242
]
4343
}

‎dynamic_values/cluster_worker_pools.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ module "ut_worker_pools" {
3636
workers_per_subnet = 2
3737
flavor = "spicy"
3838
secondary_storage = "300gb.5iops-tier"
39-
operating_system = "REDHAT_8_64"
39+
operating_system = "RHCOS"
4040
}
4141
]
4242
}

‎dynamic_values/config_modules/cluster_worker_pools/worker_pools.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ locals {
8686
vpc_id = var.vpc_modules[pool.vpc_name].vpc_id # add vpc_id
8787
subnets = module.worker_pool_subnets["${var.prefix}-${cluster.name}-${pool.name}"].subnets
8888
kube_type = cluster.kube_type
89-
operating_system = lookup(pool, "operating_system", "REDHAT_8_64")
89+
operating_system = lookup(pool, "operating_system", "RHCOS")
9090
}) if pool != null
9191
] if cluster.worker_pools != null
9292
]

‎examples/override-example/override.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"name": "workload-cluster",
1919
"secondary_storage": "300gb.5iops-tier",
2020
"resource_group": "slz-workload-rg",
21-
"operating_system": "REDHAT_8_64",
21+
"operating_system": "RHCOS",
2222
"use_ibm_cloud_private_api_endpoints": false,
2323
"verify_cluster_network_readiness": false,
2424
"kms_config": {
@@ -37,7 +37,7 @@
3737
"flavor": "bx2.16x64",
3838
"name": "logging-worker-pool",
3939
"secondary_storage": "300gb.5iops-tier",
40-
"operating_system" : "REDHAT_8_64",
40+
"operating_system": "RHCOS",
4141
"subnet_names": [
4242
"vsi-zone-1",
4343
"vsi-zone-2",
@@ -115,13 +115,13 @@
115115
"enable": true,
116116
"days": 30,
117117
"prefix": "logs/"
118-
},
119-
"archive_rule": {
118+
},
119+
"archive_rule": {
120120
"rule_id": "a-bucket-arch-rule",
121121
"enable": true,
122122
"days": 0,
123123
"type": "Glacier"
124-
}
124+
}
125125
}
126126
],
127127
"keys": [

‎ibm_catalog.json‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1279,11 +1279,8 @@
12791279
"key": "kube_version",
12801280
"type": "string",
12811281
"required": true,
1282+
"default_value": "4.18_openshift",
12821283
"options": [
1283-
{
1284-
"displayname": "Default",
1285-
"value": "default"
1286-
},
12871284
{
12881285
"displayname": "4.14_openshift",
12891286
"value": "4.14_openshift"
@@ -1299,6 +1296,10 @@
12991296
{
13001297
"displayname": "4.17_openshift",
13011298
"value": "4.17_openshift"
1299+
},
1300+
{
1301+
"displayname": "4.18_openshift",
1302+
"value": "4.18_openshift"
13021303
}
13031304
],
13041305
"custom_config": {}
@@ -1594,11 +1595,8 @@
15941595
"key": "kube_version",
15951596
"type": "string",
15961597
"required": true,
1598+
"default_value": "4.18_openshift",
15971599
"options": [
1598-
{
1599-
"displayname": "Default",
1600-
"value": "default"
1601-
},
16021600
{
16031601
"displayname": "4.14_openshift",
16041602
"value": "4.14_openshift"
@@ -1614,6 +1612,10 @@
16141612
{
16151613
"displayname": "4.17_openshift",
16161614
"value": "4.17_openshift"
1615+
},
1616+
{
1617+
"displayname": "4.18_openshift",
1618+
"value": "4.18_openshift"
16171619
}
16181620
],
16191621
"custom_config": {}

‎patterns/mixed/config.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ locals {
110110
entitlement = var.entitlement
111111
secondary_storage = var.secondary_storage
112112
use_private_endpoint = var.use_private_endpoint
113-
operating_system = "REDHAT_8_64"
113+
operating_system = "RHCOS"
114114
verify_worker_network_readiness = var.verify_worker_network_readiness
115115
boot_volume_crk_name = "${var.prefix}-roks-key"
116116
# By default, create dedicated pool for logging
@@ -123,7 +123,7 @@ locals {
123123
"vsi-zone-${zone}"
124124
]
125125
entitlement = var.entitlement
126-
operating_system = "REDHAT_8_64"
126+
operating_system = "RHCOS"
127127
workers_per_subnet = var.workers_per_zone
128128
flavor = var.flavor
129129
secondary_storage = var.secondary_storage

‎patterns/mixed/override.json‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"entitlement": "cloud_pak",
3030
"flavor": "bx2.16x64",
3131
"name": "logging-worker-pool",
32-
"operating_system": "REDHAT_8_64",
32+
"operating_system": "RHCOS",
3333
"subnet_names": [
3434
"vsi-zone-1",
3535
"vsi-zone-2",
@@ -169,7 +169,6 @@
169169
"resource_group": "slz-service-rg",
170170
"use_hs_crypto": false,
171171
"service_endpoints": "public-and-private"
172-
173172
},
174173
"resource_groups": [
175174
{
@@ -187,7 +186,7 @@
187186
],
188187
"security_groups": [],
189188
"service_endpoints": "public-and-private",
190-
"existing_vpc_cbr_zone_id" : null,
189+
"existing_vpc_cbr_zone_id": null,
191190
"ssh_keys": [
192191
{
193192
"name": "slz-ssh-key",

‎patterns/roks-quickstart/main.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ locals {
3434
"resource_group": "workload-rg",
3535
"disable_outbound_traffic_protection": true,
3636
"cluster_force_delete_storage": true,
37-
"operating_system": "REDHAT_8_64",
37+
"operating_system": "RHCOS",
3838
"kms_wait_for_apply": true,
3939
"kms_config": {
4040
"crk_name": "roks-key",

0 commit comments

Comments
 (0)