Skip to content

Commit

Permalink
remove ofas_managed_load_balancer variable
Browse files Browse the repository at this point in the history
  • Loading branch information
ImpSy committed Mar 31, 2023
1 parent 0227719 commit d8beb9b
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 10 deletions.
7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ Folder [`examples/import-ocean-cluster/`](https://github.com/spotinst/terraform-

### v2 migration guide

By default the Ocean Spark deployer jobs now run in the kube-system namespace.
#### By default the Ocean Spark deployer jobs now run in the kube-system namespace.

To avoid issues for existing clusters you will need to set the following line:
```diff
Expand All @@ -137,6 +137,10 @@ module "ocean-spark" {
}
```

#### Deprecated `ofas_managed_load_balancer` variable has been deleted

Use `ingress_managed_load_balancer` instead

### v1 migration guide

This migration revolves around 1 topic:
Expand Down Expand Up @@ -206,7 +210,6 @@ No modules.
| <a name="input_ingress_private_link_endpoint_service_address"></a> [ingress\_private\_link\_endpoint\_service\_address](#input\_ingress\_private\_link\_endpoint\_service\_address) | The name of the VPC Endpoint Service the Ocean for Apache Spark control plane should bind to when privatelink is enabled | `string` | `null` | no |
| <a name="input_log_collection_collect_driver_logs"></a> [log\_collection\_collect\_driver\_logs](#input\_log\_collection\_collect\_driver\_logs) | Controls whether the Ocean Spark cluster will collect Spark driver logs | `bool` | `true` | no |
| <a name="input_ocean_cluster_id"></a> [ocean\_cluster\_id](#input\_ocean\_cluster\_id) | Specifies the Ocean cluster identifier | `string` | n/a | yes |
| <a name="input_ofas_managed_load_balancer"></a> [ofas\_managed\_load\_balancer](#input\_ofas\_managed\_load\_balancer) | Controls whether a load balancer managed by Ocean for Apache Spark will be provisioned for the cluster (deprecated: use ingress\_managed\_load\_balancer instead) | `bool` | `null` | no |
| <a name="input_spark_additional_app_namespaces"></a> [spark\_additional\_app\_namespaces](#input\_spark\_additional\_app\_namespaces) | List of Kubernetes namespaces that should be configured to run Spark applications, in addition to the default 'spark-apps' namespace | `list(string)` | `[]` | no |
| <a name="input_webhook_host_network_ports"></a> [webhook\_host\_network\_ports](#input\_webhook\_host\_network\_ports) | Assign a list of ports on the host networks for our system pods | `list(number)` | `[]` | no |
| <a name="input_webhook_use_host_network"></a> [webhook\_use\_host\_network](#input\_webhook\_use\_host\_network) | Controls whether Ocean Spark system pods that expose webhooks will use the host network | `bool` | `false` | no |
Expand Down
2 changes: 1 addition & 1 deletion examples/from-scratch-with-private-link/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ module "ocean-spark" {

ocean_cluster_id = module.ocean-aws-k8s.ocean_id

ofas_managed_load_balancer = false
ingress_managed_load_balancer = false
ingress_load_balancer_target_group_arn = aws_lb_target_group.this.arn


Expand Down
2 changes: 1 addition & 1 deletion main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ resource "spotinst_ocean_spark" "cluster" {
managed = var.ingress_managed_controller
}
load_balancer {
managed = try(var.ofas_managed_load_balancer, var.ingress_managed_load_balancer)
managed = var.ingress_managed_load_balancer
target_group_arn = var.ingress_load_balancer_target_group_arn
service_annotations = var.ingress_load_balancer_service_annotations
}
Expand Down
6 changes: 0 additions & 6 deletions variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,6 @@ variable "ingress_managed_controller" {
default = true
}

variable "ofas_managed_load_balancer" {
type = bool
description = "Controls whether a load balancer managed by Ocean for Apache Spark will be provisioned for the cluster (deprecated: use ingress_managed_load_balancer instead)"
default = null
}

variable "ingress_managed_load_balancer" {
type = bool
description = "Controls whether a load balancer managed by Ocean for Apache Spark will be provisioned for the cluster"
Expand Down

0 comments on commit d8beb9b

Please sign in to comment.