diff --git a/examples/complete/main.tf b/examples/complete/main.tf index 98f3764..b3f6e67 100644 --- a/examples/complete/main.tf +++ b/examples/complete/main.tf @@ -4,7 +4,7 @@ module "resource_group" { source = "terraform-ibm-modules/resource-group/ibm" - version = "1.1.4" + version = "1.1.5" # if an existing resource group is not set (null) create a new one using prefix resource_group_name = var.resource_group == null ? "${var.prefix}-resource-group" : null existing_resource_group_name = var.resource_group @@ -75,7 +75,7 @@ locals { module "ocp_base" { depends_on = [ibm_is_vpc.vpc, ibm_is_subnet.cluster_subnets, ibm_is_public_gateway.gateway] source = "terraform-ibm-modules/base-ocp-vpc/ibm" - version = "3.10.1" + version = "3.20.2" cluster_name = "${var.prefix}-cluster" cos_name = "${var.prefix}-cos" resource_group_id = module.resource_group.resource_group_id diff --git a/tests/pr_test.go b/tests/pr_test.go index f7c8459..0b32947 100644 --- a/tests/pr_test.go +++ b/tests/pr_test.go @@ -33,9 +33,22 @@ func setupOptions(t *testing.T, prefix string, exampleDir string) *testhelper.Te List: []string{ // to skip update error due to operator sample app updates "module.websphere_liberty_operator.helm_release.websphere_liberty_operator_sampleapp[0]", - // to skip update error due to operator hash changes - // consider to remove this once https://github.com/terraform-ibm-modules/terraform-ibm-websphere-liberty-operator/pull/41 is merged - "module.websphere_liberty_operator.helm_release.ibm_operator_catalog[0]", + // to be all removed after the merge of https://github.com/terraform-ibm-modules/terraform-ibm-websphere-liberty-operator/pull/12 or corresponding fix https://github.com/terraform-ibm-modules/terraform-ibm-websphere-liberty-operator/pull/36 + // manage_all_addons moved to false as default + "module.ocp_base.ibm_container_addons.addons", + }, + }, + + IgnoreDestroys: testhelper.Exemptions{ // Ignore for consistency check + List: []string{ + // adding resources to ignore for modules version update - to be all removed after the merge of https://github.com/terraform-ibm-modules/terraform-ibm-websphere-liberty-operator/pull/12 or corresponding fix https://github.com/terraform-ibm-modules/terraform-ibm-websphere-liberty-operator/pull/36 + // wait_operators is removed + "module.ocp_base.time_sleep.wait_operators", + // manage_all_addons moved to false as default + "module.ocp_base.ibm_container_addons.addons", + // upgrade of cos module + "module.ocp_base.module.cos_instance[0].time_sleep.wait_for_authorization_policy[0]", + "module.ocp_base.module.cos_instance[0].ibm_resource_key.resource_key[0]", }, }, })