fix(deps): update terraform ibm to latest for the landing zone das (#802)

terraform-ibm-modules-ops · web-flow · commit 12b95d05c5ad · 2024-06-11T21:01:35.000+01:00
diff --git a/.catalog-onboard-pipeline.yaml b/.catalog-onboard-pipeline.yaml
@@ -10,18 +10,18 @@ offerings:
       - name: quickstart
         mark_ready: false
         install_type: fullstack
-        validation_type: projects
+        validation_type: schematics
       - name: standard
         mark_ready: false
         install_type: fullstack
-        validation_type: projects
+        validation_type: schematics
         scc:
           instance_id: 1c7d5f78-9262-44c3-b779-b28fe4d88c37
           region: us-south
       - name: existing-vpc
         mark_ready: false
         install_type: extension
-        validation_type: projects
+        validation_type: schematics
         pre_validation: "tests/scripts/pre-validation-deploy-slz-vpc.sh"
         post_validation: "tests/scripts/post-validation-destroy-slz-vpc.sh"
         scc:
@@ -36,7 +36,7 @@ offerings:
       - name: standard
         mark_ready: false
         install_type: fullstack
-        validation_type: projects
+        validation_type: schematics
         scc:
           instance_id: 1c7d5f78-9262-44c3-b779-b28fe4d88c37
           region: us-south
@@ -49,11 +49,11 @@ offerings:
       - name: standard
         mark_ready: false
         install_type: fullstack
-        validation_type: projects
+        validation_type: schematics
         scc:
           instance_id: 1c7d5f78-9262-44c3-b779-b28fe4d88c37
           region: us-south
       - name: quickstart
         mark_ready: false
         install_type: fullstack
-        validation_type: projects
+        validation_type: schematics
diff --git a/.secrets.baseline b/.secrets.baseline
@@ -3,7 +3,7 @@
     "files": "go.sum|^.secrets.baseline$",
     "lines": null
   },
-  "generated_at": "2023-12-13T18:26:42Z",
+  "generated_at": "2023-12-14T18:26:42Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"
diff --git a/cluster.tf b/cluster.tf
@@ -49,14 +49,15 @@ resource "ibm_container_vpc_cluster" "cluster" {
     lookup(each.value, "kube_version", null) == "default" || lookup(each.value, "kube_version", null) == null
     ? local.default_kube_version[each.value.kube_type] : each.value.kube_version
   )
-  tags                                = var.tags
-  wait_till                           = var.wait_till
-  entitlement                         = each.value.entitlement
-  secondary_storage                   = each.value.secondary_storage
-  cos_instance_crn                    = each.value.cos_instance_crn
-  pod_subnet                          = each.value.pod_subnet
-  service_subnet                      = each.value.service_subnet
-  disable_outbound_traffic_protection = each.value.disable_outbound_traffic_protection
+  tags              = var.tags
+  wait_till         = var.wait_till
+  entitlement       = each.value.entitlement
+  secondary_storage = each.value.secondary_storage
+  cos_instance_crn  = each.value.cos_instance_crn
+  pod_subnet        = each.value.pod_subnet
+  service_subnet    = each.value.service_subnet
+  # if kube_version is older than 4.15, default this value to null, otherwise provider will fail
+  disable_outbound_traffic_protection = startswith((lookup(each.value, "kube_version", null) == "default" || lookup(each.value, "kube_version", null) == null ? local.default_kube_version[each.value.kube_type] : each.value.kube_version), "4.12") || startswith((lookup(each.value, "kube_version", null) == "default" || lookup(each.value, "kube_version", null) == null ? local.default_kube_version[each.value.kube_type] : each.value.kube_version), "4.13") || startswith((lookup(each.value, "kube_version", null) == "default" || lookup(each.value, "kube_version", null) == null ? local.default_kube_version[each.value.kube_type] : each.value.kube_version), "4.14") ? null : each.value.disable_outbound_traffic_protection
   force_delete_storage                = each.value.cluster_force_delete_storage
   crk                                 = each.value.boot_volume_crk_name == null ? null : regex("key:(.*)", module.key_management.key_map[each.value.boot_volume_crk_name].crn)[0]
   kms_instance_id                     = each.value.boot_volume_crk_name == null ? null : regex(".*:(.*):key:.*", module.key_management.key_map[each.value.boot_volume_crk_name].crn)[0]
diff --git a/examples/one-vpc-one-vsi/version.tf b/examples/one-vpc-one-vsi/version.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = "1.65.1"
+      version = "1.66.0"
     }
   }
 }
diff --git a/examples/override-example/version.tf b/examples/override-example/version.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = "1.65.1"
+      version = "1.66.0"
     }
   }
 }
diff --git a/patterns/mixed/versions.tf b/patterns/mixed/versions.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = "1.65.1"
+      version = "1.66.0"
     }
     external = {
       source  = "hashicorp/external"
diff --git a/patterns/roks-quickstart/version.tf b/patterns/roks-quickstart/version.tf
@@ -4,7 +4,7 @@ terraform {
     # renovate is set up to keep provider version at the latest for all DA solutions
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = "1.65.1"
+      version = "1.66.0"
     }
   }
 }
diff --git a/patterns/roks/module/versions.tf b/patterns/roks/module/versions.tf
@@ -9,7 +9,7 @@ terraform {
     # tflint-ignore: terraform_unused_required_providers
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = ">= 1.65.1"
+      version = ">= 1.66.0"
     }
     external = {
       source  = "hashicorp/external"
diff --git a/patterns/roks/versions.tf b/patterns/roks/versions.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = "1.65.1"
+      version = "1.66.0"
     }
     # tflint-ignore: terraform_unused_required_providers
     external = {
diff --git a/patterns/vpc/module/version.tf b/patterns/vpc/module/version.tf
@@ -9,7 +9,7 @@ terraform {
     # tflint-ignore: terraform_unused_required_providers
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = ">= 1.65.1"
+      version = ">= 1.66.0"
     }
     external = {
       source  = "hashicorp/external"
diff --git a/patterns/vpc/version.tf b/patterns/vpc/version.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = "1.65.1"
+      version = "1.66.0"
     }
     # tflint-ignore: terraform_unused_required_providers
     external = {
diff --git a/patterns/vsi-extension/version.tf b/patterns/vsi-extension/version.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = "1.65.1"
+      version = "1.66.0"
     }
     # tflint-ignore: terraform_unused_required_providers
     external = {
diff --git a/patterns/vsi-quickstart/version.tf b/patterns/vsi-quickstart/version.tf
@@ -4,7 +4,7 @@ terraform {
     # renovate is set up to keep provider version at the latest for all DA solutions
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = "1.65.1"
+      version = "1.66.0"
     }
   }
 }
diff --git a/patterns/vsi/module/versions.tf b/patterns/vsi/module/versions.tf
@@ -9,7 +9,7 @@ terraform {
     # tflint-ignore: terraform_unused_required_providers
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = ">= 1.65.1"
+      version = ">= 1.66.0"
     }
     external = {
       source  = "hashicorp/external"
diff --git a/patterns/vsi/versions.tf b/patterns/vsi/versions.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = "1.65.1"
+      version = "1.66.0"
     }
     # tflint-ignore: terraform_unused_required_providers
     external = {

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`"files": "go.sum\|^.secrets.baseline$",`
`4`	`4`	`"lines": null`
`5`	`5`	`},`
`6`		`- "generated_at": "2023-12-13T18:26:42Z",`
	`6`	`+ "generated_at": "2023-12-14T18:26:42Z",`
`7`	`7`	`"plugins_used": [`
`8`	`8`	`{`
`9`	`9`	`"name": "AWSKeyDetector"`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ terraform {`
`3`	`3`	`required_providers {`
`4`	`4`	`ibm = {`
`5`	`5`	`source = "IBM-Cloud/ibm"`
`6`		`- version = "1.65.1"`
	`6`	`+ version = "1.66.0"`
`7`	`7`	`}`
`8`	`8`	`}`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ terraform {`
`8`	`8`	`required_providers {`
`9`	`9`	`ibm = {`
`10`	`10`	`source = "IBM-Cloud/ibm"`
`11`		`- version = "1.65.1"`
	`11`	`+ version = "1.66.0"`
`12`	`12`	`}`
`13`	`13`	`external = {`
`14`	`14`	`source = "hashicorp/external"`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ terraform {`
`4`	`4`	`# renovate is set up to keep provider version at the latest for all DA solutions`
`5`	`5`	`ibm = {`
`6`	`6`	`source = "IBM-Cloud/ibm"`
`7`		`- version = "1.65.1"`
	`7`	`+ version = "1.66.0"`
`8`	`8`	`}`
`9`	`9`	`}`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ terraform {`
`9`	`9`	`# tflint-ignore: terraform_unused_required_providers`
`10`	`10`	`ibm = {`
`11`	`11`	`source = "IBM-Cloud/ibm"`
`12`		`- version = ">= 1.65.1"`
	`12`	`+ version = ">= 1.66.0"`
`13`	`13`	`}`
`14`	`14`	`external = {`
`15`	`15`	`source = "hashicorp/external"`