From 11e1ecf4131c94ea330cadbb53bd26b22f0305da Mon Sep 17 00:00:00 2001 From: valerio-bontempi Date: Mon, 24 Feb 2025 16:57:09 +0100 Subject: [PATCH 1/3] fix: force upgrade of common-dev-assets alone --- common-dev-assets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common-dev-assets b/common-dev-assets index 151f5e7f..c3e67b4a 160000 --- a/common-dev-assets +++ b/common-dev-assets @@ -1 +1 @@ -Subproject commit 151f5e7fb5a775ed3bea62d9ba5b326cd5fbdc80 +Subproject commit c3e67b4ab4ed41f1b0239ae52e306dc8737ea591 From 71bc8dd7d62f5912337afbfaff35923f1b7ea441 Mon Sep 17 00:00:00 2001 From: valerio-bontempi Date: Tue, 25 Feb 2025 15:44:06 +0100 Subject: [PATCH 2/3] fix: bump to base-ocp-version to solve RBAC synch issue --- examples/all-combined/main.tf | 2 +- examples/basic/main.tf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/all-combined/main.tf b/examples/all-combined/main.tf index 2b4c7cbc..ae218e0e 100644 --- a/examples/all-combined/main.tf +++ b/examples/all-combined/main.tf @@ -186,7 +186,7 @@ module "network_acl" { # OCP CLUSTER creation module "ocp_base" { source = "terraform-ibm-modules/base-ocp-vpc/ibm" - version = "3.35.10" + version = "3.41.2" cluster_name = "${var.prefix}-vpc" resource_group_id = module.resource_group.resource_group_id region = var.region diff --git a/examples/basic/main.tf b/examples/basic/main.tf index 6f6e4cf7..57a4f4ab 100644 --- a/examples/basic/main.tf +++ b/examples/basic/main.tf @@ -209,7 +209,7 @@ module "network_acl" { # OCP CLUSTER creation module "ocp_base" { source = "terraform-ibm-modules/base-ocp-vpc/ibm" - version = "3.35.10" + version = "3.41.2" cluster_name = "${var.prefix}-vpc" resource_group_id = module.resource_group.resource_group_id region = var.region From b3f68c50fc113d914aa90f2028378b320737f82b Mon Sep 17 00:00:00 2001 From: valerio-bontempi Date: Tue, 25 Feb 2025 17:30:56 +0100 Subject: [PATCH 3/3] fix: SKIP UPGRADE TEST --- examples/all-combined/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/examples/all-combined/README.md b/examples/all-combined/README.md index 8b914d13..a000ff44 100644 --- a/examples/all-combined/README.md +++ b/examples/all-combined/README.md @@ -43,7 +43,6 @@ This end-to-end example performs the following actions - Creates and deploys a key-value secret with multiple key-value couples - In order to create the intermediate certificate the following parameters are needed: - imported_certificate_sm_id: Secrets Manager ID where the componenents for the imported certificate are stored - imported_certificate_sm_region: region of the Secrets Manager instance where the componenents for the imported certificate are stored