Skip to content

Commit

Permalink
feat: removed the input operating_system. Its now required to pass …
Browse files Browse the repository at this point in the history
…it as part of the `worker_pools` input. (#344)

- update terraform-module
  • Loading branch information
Aashiq-J authored Oct 25, 2024
1 parent 9d12383 commit 9483909
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 18 deletions.
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,8 @@ You need the following permissions to run this module.

| Name | Source | Version |
|------|--------|---------|
| <a name="module_observability_agents"></a> [observability\_agents](#module\_observability\_agents) | terraform-ibm-modules/observability-agents/ibm | 1.30.2 |
| <a name="module_ocp_base"></a> [ocp\_base](#module\_ocp\_base) | terraform-ibm-modules/base-ocp-vpc/ibm | 3.33.0 |
| <a name="module_observability_agents"></a> [observability\_agents](#module\_observability\_agents) | terraform-ibm-modules/observability-agents/ibm | 2.0.0 |
| <a name="module_ocp_base"></a> [ocp\_base](#module\_ocp\_base) | terraform-ibm-modules/base-ocp-vpc/ibm | 3.34.0 |
| <a name="module_trusted_profile"></a> [trusted\_profile](#module\_trusted\_profile) | terraform-ibm-modules/trusted-profile/ibm | 1.0.4 |

### Resources
Expand Down Expand Up @@ -235,7 +235,6 @@ No resources.
| <a name="input_number_of_lbs"></a> [number\_of\_lbs](#input\_number\_of\_lbs) | The number of load balancer to associate with the `additional_lb_security_group_names` security group. Must match the number of load balancers that are associated with the cluster | `number` | `1` | 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 'default' (current IKS default recommended version). If no value is passed, it will default to 'default'. | `string` | `null` | no |
| <a name="input_operating_system"></a> [operating\_system](#input\_operating\_system) | The operating system of the workers in the default worker pool. If no value is specified, the current default version OS will be used. See https://cloud.ibm.com/docs/openshift?topic=openshift-openshift_versions#openshift_versions_available . | `string` | `null` | no |
| <a name="input_region"></a> [region](#input\_region) | The IBM Cloud region where all resources will be provisioned. | `string` | n/a | yes |
| <a name="input_resource_group_id"></a> [resource\_group\_id](#input\_resource\_group\_id) | The IBM Cloud resource group ID to provision all resources in. | `string` | n/a | yes |
| <a name="input_use_existing_cos"></a> [use\_existing\_cos](#input\_use\_existing\_cos) | Flag indicating whether or not to use an existing COS instance for OpenShift internal registry storage. Only applicable if 'enable\_registry\_storage' is true | `bool` | `false` | no |
Expand Down
4 changes: 2 additions & 2 deletions examples/end-to-end-example/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ module "vpc" {

module "observability_instances" {
source = "terraform-ibm-modules/observability-instances/ibm"
version = "3.0.1"
version = "3.1.0"
region = var.region
resource_group_id = module.resource_group.resource_group_id
cloud_logs_instance_name = "${var.prefix}-icl"
Expand All @@ -177,7 +177,7 @@ locals {

module "key_protect_all_inclusive" {
source = "terraform-ibm-modules/kms-all-inclusive/ibm"
version = "4.15.13"
version = "4.16.4"
resource_group_id = module.resource_group.resource_group_id
region = var.region
key_protect_instance_name = "${var.prefix}-kp"
Expand Down
5 changes: 2 additions & 3 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ locals {

module "ocp_base" {
source = "terraform-ibm-modules/base-ocp-vpc/ibm"
version = "3.33.0"
version = "3.34.0"
cluster_name = var.cluster_name
ocp_version = var.ocp_version
resource_group_id = var.resource_group_id
Expand Down Expand Up @@ -52,7 +52,6 @@ module "ocp_base" {
cluster_config_endpoint_type = var.cluster_config_endpoint_type
enable_registry_storage = var.enable_registry_storage
disable_outbound_traffic_protection = var.disable_outbound_traffic_protection
operating_system = var.operating_system
import_default_worker_pool_on_create = var.import_default_worker_pool_on_create
allow_default_worker_pool_replacement = var.allow_default_worker_pool_replacement
}
Expand Down Expand Up @@ -100,7 +99,7 @@ module "trusted_profile" {
module "observability_agents" {
count = var.logs_agent_enabled == true || var.cloud_monitoring_enabled == true ? 1 : 0
source = "terraform-ibm-modules/observability-agents/ibm"
version = "1.30.2"
version = "2.0.0"
cluster_id = module.ocp_base.cluster_id
cluster_resource_group_id = var.resource_group_id
cluster_config_endpoint_type = var.cluster_config_endpoint_type
Expand Down
10 changes: 0 additions & 10 deletions variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -284,16 +284,6 @@ variable "disable_outbound_traffic_protection" {
default = false
}

variable "operating_system" {
type = string
description = "The operating system of the workers in the default worker pool. If no value is specified, the current default version OS will be used. See https://cloud.ibm.com/docs/openshift?topic=openshift-openshift_versions#openshift_versions_available ."
default = null
validation {
error_message = "RHEL 8 (REDHAT_8_64) or Red Hat Enterprise Linux CoreOS (RHCOS) are the allowed OS values. RHCOS requires VPC clusters created from 4.15 onwards. Upgraded clusters from 4.14 cannot use RHCOS."
condition = var.operating_system == null || var.operating_system == "REDHAT_8_64" || var.operating_system == "RHCOS"
}
}

variable "import_default_worker_pool_on_create" {
type = bool
description = "(Advanced users) Whether to handle the default worker pool as a stand-alone ibm_container_vpc_worker_pool resource on cluster creation. Only set to false if you understand the implications of managing the default worker pool as part of the cluster resource. Set to true to import the default worker pool as a separate resource. Set to false to manage the default worker pool as part of the cluster resource."
Expand Down

0 comments on commit 9483909

Please sign in to comment.