Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(deps): make landing zone DA an optional dependency in ibm_catalog.json #72

Merged
merged 4 commits into from
Sep 19, 2024
Merged

fix(deps): make landing zone DA an optional dependency in ibm_catalog.json #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
db651f5
chore(deps): update terraform-module
terraform-ibm-modules-ops Sep 15, 2024
3467492
add workaorund to test
ocofaigh Sep 19, 2024
4173837
SKIP UPGRADE TEST
ocofaigh Sep 19, 2024
1c7d075
Merge branch 'main' into renovate/terraform-module
ocofaigh Sep 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .secrets.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"files": "go.sum|^.secrets.baseline$",
"lines": null
},
"generated_at": "2023-12-10T06:39:44Z",
"generated_at": "2023-12-11T06:39:44Z",
"plugins_used": [
{
"name": "AWSKeyDetector"
Expand Down
2 changes: 1 addition & 1 deletion examples/complete/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.30.0"
version = "3.30.1"
cluster_name = "${var.prefix}-cluster"
cos_name = "${var.prefix}-cos"
resource_group_id = module.resource_group.resource_group_id
Expand Down
5 changes: 3 additions & 2 deletions ibm_catalog.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,12 @@
"dependencies": [
{
"flavors": [
"standard"
"quickstart"
],
"id": "95fccffc-ae3b-42df-b6d9-80be5914d852-global",
"name": "deploy-arch-ibm-slz-ocp",
"version": "v5.1.1-rc"
"version": ">=v5.20.0",
"optional": true
}
],
"configuration": [
Expand Down
6 changes: 6 additions & 0 deletions tests/pr_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,12 @@ func TestRunSLZExample(t *testing.T) {
TerraformDir: "extensions/landing-zone",
// Do not hard fail the test if the implicit destroy steps fail to allow a full destroy of resource to occur
ImplicitRequired: false,
ImplicitDestroy: []string{
// workaround for the issue https://github.ibm.com/GoldenEye/issues/issues/10743
// when the issue is fixed on IKS, so the destruction of default workers pool is correctly managed on provider/clusters service the next two entries should be removed
"module.ocp_base.ibm_container_vpc_worker_pool.autoscaling_pool[\"default\"]",
"module.ocp_base.ibm_container_vpc_worker_pool.pool[\"default\"]",
},
TerraformVars: map[string]interface{}{
"cluster_id": terraform.Output(t, existingTerraformOptions, "workload_cluster_id"),
"region": terraform.Output(t, existingTerraformOptions, "region"),
Expand Down
2 changes: 1 addition & 1 deletion tests/resources/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
##############################################################################

module "landing_zone" {
source = "git::https://github.com/terraform-ibm-modules/terraform-ibm-landing-zone//patterns//roks-quickstart?ref=v5.31.1"
source = "git::https://github.com/terraform-ibm-modules/terraform-ibm-landing-zone//patterns//roks-quickstart?ref=v5.31.3"
ibmcloud_api_key = var.ibmcloud_api_key
region = var.region
prefix = var.prefix
Expand Down