Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

LBAAS: increase maximum lb size_unit, add regional_network type support #1284

Merged
merged 4 commits into from
Dec 3, 2024
Merged

LBAAS: increase maximum lb size_unit, add regional_network type support #1284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
09b7eb0
LBAAS: increase maximum lb size_unit
jvasilevsky Dec 2, 2024
3b829bd
LBAAS: support REGIONAL_NETWORK type
jvasilevsky Dec 2, 2024
7aa7c56
LBAAS:
jvasilevsky Dec 3, 2024
8c8804b
Merge branch 'digitalocean:main' into jvasilevsky/LBAAS-increase-max-…
jvasilevsky Dec 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion digitalocean/loadbalancer/datasource_loadbalancer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ func DataSourceDigitalOceanLoadbalancer() *schema.Resource {
"type": {
Type: schema.TypeString,
Computed: true,
Description: "the type of the load balancer (GLOBAL or REGIONAL)",
Description: "the type of the load balancer (GLOBAL, REGIONAL, or REGIONAL_NETWORK)",
},
"domains": {
Type: schema.TypeSet,
Expand Down
8 changes: 4 additions & 4 deletions digitalocean/loadbalancer/resource_loadbalancer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ func loadbalancerDiffCheck(ctx context.Context, d *schema.ResourceDiff, v interf
if regionSet && region.(string) != "" {
return fmt.Errorf("'region' must be empty or not set when 'type' is '%s'", typStr)
}
case "REGIONAL":
case "REGIONAL", "REGIONAL_NETWORK":
if !regionSet || region.(string) == "" {
return fmt.Errorf("'region' must be set and not be empty when 'type' is '%s'", typStr)
}
Expand Down Expand Up @@ -180,7 +180,7 @@ func resourceDigitalOceanLoadBalancerV0() *schema.Resource {
Type: schema.TypeInt,
Optional: true,
Computed: true,
ValidateFunc: validation.IntBetween(1, 100),
ValidateFunc: validation.IntBetween(1, 200),
},
"name": {
Type: schema.TypeString,
Expand Down Expand Up @@ -443,8 +443,8 @@ func resourceDigitalOceanLoadBalancerV0() *schema.Resource {
Type: schema.TypeString,
Optional: true,
ForceNew: true,
ValidateFunc: validation.StringInSlice([]string{"REGIONAL", "GLOBAL"}, true),
Description: "the type of the load balancer (GLOBAL or REGIONAL)",
ValidateFunc: validation.StringInSlice([]string{"REGIONAL", "GLOBAL", "REGIONAL_NETWORK"}, true),
Description: "the type of the load balancer (GLOBAL, REGIONAL, or REGIONAL_NETWORK)",
},

"domains": {
Expand Down
5 changes: 2 additions & 3 deletions docs/resources/loadbalancer.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ The following arguments are supported:
* `name` - (Required) The Load Balancer name
* `region` - (Required) The region to start in
* `size` - (Optional) The size of the Load Balancer. It must be either `lb-small`, `lb-medium`, or `lb-large`. Defaults to `lb-small`. Only one of `size` or `size_unit` may be provided.
* `size_unit` - (Optional) The size of the Load Balancer. It must be in the range (1, 100). Defaults to `1`. Only one of `size` or `size_unit` may be provided.
* `size_unit` - (Optional) The size of the Load Balancer. It must be in the range (1, 200). Defaults to `1`. Only one of `size` or `size_unit` may be provided.
* `algorithm` - (Optional) **Deprecated** This field has been deprecated. You can no longer specify an algorithm for load balancers.
or `least_connections`. The default value is `round_robin`.
* `forwarding_rule` - (Required) A list of `forwarding_rule` to be assigned to the
Expand All @@ -119,10 +119,9 @@ the backend service. Default value is `false`.
* `domains` (Optional) - A list of `domains` required to ingress traffic to a Global Load Balancer. The `domains` block is documented below.
* `glb_settings` (Optional) - A block containing `glb_settings` required to define target rules for a Global Load Balancer. The `glb_settings` block is documented below.
* `target_load_balancer_ids` (Optional) - A list of Load Balancer IDs to be attached behind a Global Load Balancer.
* `type` - (Optional) The type of the Load Balancer. It must be either of `REGIONAL` or `GLOBAL`. Defaults to `REGIONAL`.
* `type` - (Optional) The type of the Load Balancer. It must be either of `REGIONAL`, `REGIONAL_NETWORK`, or `GLOBAL`. Defaults to `REGIONAL`.
**NOTE**: non-`REGIONAL/GLOBAL` type may be part of closed beta feature and not available for public use.
* `network` - (Optional) The type of network the Load Balancer is accessible from. It must be either of `INTERNAL` or `EXTERNAL`. Defaults to `EXTERNAL`.
**NOTE**: non-`EXTERNAL` type may be part of closed beta feature and not available for public use.

`forwarding_rule` supports the following:

Expand Down
Loading