feat: add variable and option to not manage all addons (#296)

Author: toddgiguere

.secrets.baseline

@@ -3,7 +3,7 @@
     "files": "go.sum|^.secrets.baseline$",
     "lines": null
   },
-  "generated_at": "2023-07-08T10:32:00Z",
+  "generated_at": "2023-07-09T10:32:00Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"

README.md

@@ -199,6 +199,7 @@ Optionally, you need the following permissions to attach Access Management tags
 | <a name="input_ibmcloud_api_key"></a> [ibmcloud\_api\_key](#input\_ibmcloud\_api\_key) | APIkey that's associated with the account to use, set via environment variable TF\_VAR\_ibmcloud\_api\_key | `string` | n/a | yes |
 | <a name="input_ignore_worker_pool_size_changes"></a> [ignore\_worker\_pool\_size\_changes](#input\_ignore\_worker\_pool\_size\_changes) | Enable if using worker autoscaling. Stops Terraform managing worker count | `bool` | `false` | no |
 | <a name="input_kms_config"></a> [kms\_config](#input\_kms\_config) | Use to attach a Key Protect instance to the cluster | <pre>object({<br>    crk_id           = string<br>    instance_id      = string<br>    private_endpoint = optional(bool, true) # defaults to true<br>  })</pre> | `null` | no |
+| <a name="input_manage_all_addons"></a> [manage\_all\_addons](#input\_manage\_all\_addons) | Instructs Terraform to manage all cluster addons, even if addons were installed outside of the module. If set to 'true' this module will destroy any addons that were installed by other sources. | `bool` | `false` | no |
 | <a name="input_ocp_entitlement"></a> [ocp\_entitlement](#input\_ocp\_entitlement) | Value that is applied to the entitlements for OCP cluster provisioning | `string` | `"cloud_pak"` | no |
 | <a name="input_ocp_version"></a> [ocp\_version](#input\_ocp\_version) | The version of the OpenShift cluster that should be provisioned (format 4.x). This is only used during initial cluster provisioning, but ignored for future updates. Supports passing the string 'latest' (current latest available version) or 'default' (current IKS default recommended version). If no value is passed, it will default to 'default'. | `string` | `null` | no |
 | <a name="input_region"></a> [region](#input\_region) | The IBM Cloud region where the cluster will be provisioned. | `string` | n/a | yes |

main.tf

@@ -380,6 +380,9 @@ resource "ibm_container_addons" "addons" {
   cluster           = local.cluster_id
   resource_group_id = var.resource_group_id
 
+  # setting to false means we do not want Terraform to manage addons that are managed elsewhere
+  manage_all_addons = var.manage_all_addons
+
   dynamic "addons" {
     for_each = local.addons
     content {

tests/pr_test.go

@@ -103,6 +103,13 @@ func TestFSCloudExample(t *testing.T) {
 		},
 	})
 
+	// If "jp-osa" was the best region selected, default to us-south instead.
+	// "jp-osa" is currently not allowing hs-crypto be used for encrypting buckets in that region.
+	currentRegion, ok := options.TerraformVars["region"]
+	if ok && currentRegion == "jp-osa" {
+		options.TerraformVars["region"] = "us-south"
+	}
+
 	output, err := options.RunTestConsistency()
 
 	assert.Nil(t, err, "This should not have errored")

variables.tf

@@ -214,6 +214,13 @@ variable "addons" {
   default     = null
 }
 
+variable "manage_all_addons" {
+  type        = bool
+  default     = false
+  nullable    = false # null values are set to default value
+  description = "Instructs Terraform to manage all cluster addons, even if addons were installed outside of the module. If set to 'true' this module will destroy any addons that were installed by other sources."
+}
+
 variable "cluster_config_endpoint_type" {
   description = "Specify which type of endpoint to use for for cluster config access: 'default', 'private', 'vpe', 'link'. 'default' value will use the default endpoint of the cluster."
   type        = string