From 01c1ebc15c252d4650ca08ce72b79b0a0b071823 Mon Sep 17 00:00:00 2001 From: Guilherme Branco Date: Mon, 30 Sep 2024 17:51:37 -0300 Subject: [PATCH] OCM-11448 | fix: 'ack_for' variable should be a string --- README.md | 2 +- modules/machine-pool/README.md | 2 +- modules/machine-pool/variables.tf | 2 +- modules/rosa-cluster-hcp/README.md | 2 +- modules/rosa-cluster-hcp/variables.tf | 2 +- variables.tf | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 323d207..9988604 100644 --- a/README.md +++ b/README.md @@ -141,7 +141,7 @@ We recommend you install the following CLI tools: | [replicas](#input\_replicas) | Number of worker nodes to provision. This attribute is applicable solely when autoscaling is disabled. Single zone clusters need at least 2 nodes, multizone clusters need at least 3 nodes. Hosted clusters require that the number of worker nodes be a multiple of the number of private subnets. (default: 2) | `number` | `null` | no | | [service\_cidr](#input\_service\_cidr) | Block of IP addresses for services, for example "172.30.0.0/16". | `string` | `null` | no | | [tags](#input\_tags) | Apply user defined tags to all cluster resources created in AWS. After the creation of the cluster is completed, it is not possible to update this attribute. | `map(string)` | `null` | no | -| [upgrade\_acknowledgements\_for](#input\_upgrade\_acknowledgements\_for) | Indicates acknowledgement of agreements required to upgrade the cluster version between minor versions (e.g. a value of "4.12" indicates acknowledgement of any agreements required to upgrade to OpenShift 4.12.z from 4.11 or before). | `bool` | `null` | no | +| [upgrade\_acknowledgements\_for](#input\_upgrade\_acknowledgements\_for) | Indicates acknowledgement of agreements required to upgrade the cluster version between minor versions (e.g. a value of "4.12" indicates acknowledgement of any agreements required to upgrade to OpenShift 4.12.z from 4.11 or before). | `string` | `null` | no | | [wait\_for\_create\_complete](#input\_wait\_for\_create\_complete) | Wait until the cluster is either in a ready state or in an error state. The waiter has a timeout of 20 minutes. (default: true) | `bool` | `true` | no | | [wait\_for\_std\_compute\_nodes\_complete](#input\_wait\_for\_std\_compute\_nodes\_complete) | Wait until the initial set of machine pools to be available. The waiter has a timeout of 60 minutes. (default: true) | `bool` | `true` | no | diff --git a/modules/machine-pool/README.md b/modules/machine-pool/README.md index cc0561d..bbb1551 100644 --- a/modules/machine-pool/README.md +++ b/modules/machine-pool/README.md @@ -70,7 +70,7 @@ No modules. | [subnet\_id](#input\_subnet\_id) | Select the subnet in which to create a single AZ machine pool for BYO-VPC cluster | `string` | n/a | yes | | [taints](#input\_taints) | Taints for a machine pool. This list will overwrite any modifications made to node taints on an ongoing basis. | 
list(object({
    key           = string
    value         = string
    schedule_type = string
  }))
| `null` | no | | [tuning\_configs](#input\_tuning\_configs) | A list of tuning config names to attach to this machine pool. The tuning configs must already exist | `list(string)` | `null` | no | -| [upgrade\_acknowledgements\_for](#input\_upgrade\_acknowledgements\_for) | Indicates acknowledgement of agreements required to upgrade the cluster version between minor versions (e.g. a value of "4.12" indicates acknowledgement of any agreements required to upgrade to OpenShift 4.12.z from 4.11 or before). | `bool` | `null` | no | +| [upgrade\_acknowledgements\_for](#input\_upgrade\_acknowledgements\_for) | Indicates acknowledgement of agreements required to upgrade the cluster version between minor versions (e.g. a value of "4.12" indicates acknowledgement of any agreements required to upgrade to OpenShift 4.12.z from 4.11 or before). | `string` | `null` | no | ## Outputs diff --git a/modules/machine-pool/variables.tf b/modules/machine-pool/variables.tf index 5e39f24..92f8bb3 100644 --- a/modules/machine-pool/variables.tf +++ b/modules/machine-pool/variables.tf @@ -75,7 +75,7 @@ variable "openshift_version" { } variable "upgrade_acknowledgements_for" { - type = bool + type = string default = null description = "Indicates acknowledgement of agreements required to upgrade the cluster version between minor versions (e.g. a value of \"4.12\" indicates acknowledgement of any agreements required to upgrade to OpenShift 4.12.z from 4.11 or before)." } diff --git a/modules/rosa-cluster-hcp/README.md b/modules/rosa-cluster-hcp/README.md index a6fa84b..e4108af 100644 --- a/modules/rosa-cluster-hcp/README.md +++ b/modules/rosa-cluster-hcp/README.md @@ -110,7 +110,7 @@ No modules. | [service\_cidr](#input\_service\_cidr) | Block of IP addresses for services, for example "172.30.0.0/16". | `string` | `null` | no | | [support\_role\_arn](#input\_support\_role\_arn) | The Amazon Resource Name (ARN) associated with the AWS IAM role used by Red Hat SREs to enable access to the cluster account in order to provide support. | `string` | `null` | no | | [tags](#input\_tags) | Apply user defined tags to all cluster resources created in AWS. After the creation of the cluster is completed, it is not possible to update this attribute. | `map(string)` | `null` | no | -| [upgrade\_acknowledgements\_for](#input\_upgrade\_acknowledgements\_for) | Indicates acknowledgement of agreements required to upgrade the cluster version between minor versions (e.g. a value of "4.12" indicates acknowledgement of any agreements required to upgrade to OpenShift 4.12.z from 4.11 or before). | `bool` | `null` | no | +| [upgrade\_acknowledgements\_for](#input\_upgrade\_acknowledgements\_for) | Indicates acknowledgement of agreements required to upgrade the cluster version between minor versions (e.g. a value of "4.12" indicates acknowledgement of any agreements required to upgrade to OpenShift 4.12.z from 4.11 or before). | `string` | `null` | no | | [wait\_for\_create\_complete](#input\_wait\_for\_create\_complete) | Wait until the cluster is either in a ready state or in an error state. The waiter has a timeout of 20 minutes. (default: true) | `bool` | `true` | no | | [wait\_for\_std\_compute\_nodes\_complete](#input\_wait\_for\_std\_compute\_nodes\_complete) | Wait until the cluster standard compute nodes are available. The waiter has a timeout of 60 minutes. (default: true) | `bool` | `true` | no | | [worker\_role\_arn](#input\_worker\_role\_arn) | The Amazon Resource Name (ARN) associated with the AWS IAM role that will be used by the cluster's compute instances. | `string` | `null` | no | diff --git a/modules/rosa-cluster-hcp/variables.tf b/modules/rosa-cluster-hcp/variables.tf index a9adfc3..5545f18 100644 --- a/modules/rosa-cluster-hcp/variables.tf +++ b/modules/rosa-cluster-hcp/variables.tf @@ -224,7 +224,7 @@ variable "destroy_timeout" { } variable "upgrade_acknowledgements_for" { - type = bool + type = string default = null description = "Indicates acknowledgement of agreements required to upgrade the cluster version between minor versions (e.g. a value of \"4.12\" indicates acknowledgement of any agreements required to upgrade to OpenShift 4.12.z from 4.11 or before)." } diff --git a/variables.tf b/variables.tf index f6db068..05e0777 100644 --- a/variables.tf +++ b/variables.tf @@ -173,7 +173,7 @@ variable "destroy_timeout" { } variable "upgrade_acknowledgements_for" { - type = bool + type = string default = null description = "Indicates acknowledgement of agreements required to upgrade the cluster version between minor versions (e.g. a value of \"4.12\" indicates acknowledgement of any agreements required to upgrade to OpenShift 4.12.z from 4.11 or before)." }