Skip to content

Commit 5769fb9

Browse files
rcohenmaalexng-canuck
authored andcommitted
Adding Path Route Sets to Load Balancer service, updating Listener to include Connection Config, and some documentation fixes
1 parent e324cd5 commit 5769fb9

22 files changed

+1471
-213
lines changed

docs/core/dhcp_options.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,19 @@ Note that the `options` object you provide replaces the entire existing set of o
7777
The following arguments support updates:
7878
* `display_name` - A user-friendly name. Does not have to be unique, and it's changeable. Avoid entering confidential information.
7979
* `options` - A set of [DHCP Options](https://docs.us-phoenix-1.oraclecloud.com/api/#/en/iaas/20160918/DhcpDnsOption/)
80-
80+
* `type` - The specific DHCP option. Either `DomainNameServer` (for [DhcpDnsOption](https://docs.us-phoenix-1.oraclecloud.com/api/#/en/iaas/20160918/DhcpDnsOption/)) or `SearchDomain` (for [DhcpSearchDomainOption](https://docs.us-phoenix-1.oraclecloud.com/api/#/en/iaas/20160918/DhcpSearchDomainOption/)).
81+
* `custom_dns_servers` - Used only when `type` is `DomainNameServer`. If you set `server_type` to `CustomDnsServer`, specify the IP address of at least one DNS server of your choice (three maximum).
82+
* `server_type` - Used only when `type` is `DomainNameServer`. It can be set to one of the following values:
83+
* `VcnLocal`: Reserved for future use.
84+
* `VcnLocalPlusInternet`: Also referred to as "Internet and VCN Resolver". Instances can resolve internet hostnames (no Internet Gateway is required), and can resolve hostnames of instances in the VCN. This is the default value in the default set of DHCP options in the VCN. For the Internet and VCN Resolver to work across the VCN, there must also be a DNS label set for the VCN, a DNS label set for each subnet, and a hostname for each instance. The Internet and VCN Resolver also enables reverse DNS lookup, which lets you determine the hostname corresponding to the private IP address.
85+
* `CustomDnsServer`: Instances use a DNS server of your choice (three maximum).
86+
* `search_domain_names` - Used only when `type` is `SearchDomainNames`. A single search domain name according to [RFC 952](https://tools.ietf.org/html/rfc952) and [RFC 1123](https://tools.ietf.org/html/rfc1123). During a DNS query,
87+
the OS will append this search domain name to the value being queried.
88+
If you set [DhcpDnsOption](https://docs.us-phoenix-1.oraclecloud.com/api/#/en/iaas/20160918/DhcpDnsOption/) to `VcnLocalPlusInternet`,
89+
and you assign a DNS label to the VCN during creation, the search domain name in the
90+
VCN's default set of DHCP options is automatically set to the VCN domain (for example, `vcn1.oraclevcn.com`).
91+
If you don't want to use a search domain name, omit this option from the set of DHCP options. Do not include this option with an empty list
92+
of search domain names, or with an empty string as the value for any search domain name.
8193

8294
** IMPORTANT **
8395
Any change to a property that does not support update will force the destruction and recreation of the resource with the new property values

docs/core/route_tables.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ Note that the `routeRules` object you provide replaces the entire existing set o
5858
The following arguments support updates:
5959
* `display_name` - A user-friendly name. Does not have to be unique, and it's changeable. Avoid entering confidential information.
6060
* `route_rules` - The collection of rules used for routing destination IPs to network devices.
61+
* `cidr_block` - A destination IP address range in CIDR notation. Matching packets will be routed to the indicated network entity (the target). Example: `0.0.0.0/0`
62+
* `network_entity_id` - The OCID for the route rule's target. For information about the type of targets you can specify, see [Route Tables](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingroutetables.htm).
6163

6264

6365
** IMPORTANT **

docs/examples/load_balancer/lb_full/lb_full.tf

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,12 +217,31 @@ resource "oci_load_balancer_certificate" "lb-cert1" {
217217
public_certificate = "-----BEGIN CERTIFICATE-----\nMIIBNzCB4gIJAKtwJkxUgNpzMA0GCSqGSIb3DQEBCwUAMCMxITAfBgNVBAoTGElu\ndGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0xNzA0MTIyMTU3NTZaFw0xODA0MTIy\nMTU3NTZaMCMxITAfBgNVBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDBcMA0G\nCSqGSIb3DQEBAQUAA0sAMEgCQQDlM8lz3BFJA6zBlsF63k9ajPVq3Q1WQoHQ3j35\n08DRKIfwqfV+CxL63W3dZrwL4TrjqorP5CQ36+I6OWALH2zVAgMBAAEwDQYJKoZI\nhvcNAQELBQADQQCEjHVQJoiiVpIIvDWF+4YDRReVuwzrvq2xduWw7CIsDWlYuGZT\nQKVY6tnTy2XpoUk0fqUvMB/M2HGQ1WqZGHs6\n-----END CERTIFICATE-----"
218218
}
219219

220+
resource "oci_load_balancer_path_route_set" "test_path_route_set" {
221+
#Required
222+
load_balancer_id = "${oci_load_balancer.lb1.id}"
223+
name = "pr-set1"
224+
path_routes {
225+
#Required
226+
backend_set_name = "${oci_load_balancer_backendset.lb-bes1.name}"
227+
path = "/example/video/123"
228+
path_match_type {
229+
#Required
230+
match_type = "EXACT_MATCH"
231+
}
232+
233+
}
234+
}
235+
220236
resource "oci_load_balancer_listener" "lb-listener1" {
221237
load_balancer_id = "${oci_load_balancer.lb1.id}"
222238
name = "http"
223239
default_backend_set_name = "${oci_load_balancer_backendset.lb-bes1.id}"
224240
port = 80
225241
protocol = "HTTP"
242+
connection_configuration {
243+
idle_timeout_in_seconds = "2"
244+
}
226245
}
227246

228247
resource "oci_load_balancer_listener" "lb-listener2" {

docs/load_balancer/backend_sets.md

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# oci_load_balancer_backend_set
1+
# oci_load_balancer_backendset
22

33
## BackendSet Resource
44

@@ -65,20 +65,21 @@ The following arguments are supported:
6565
Updates a backend set.
6666

6767
The following arguments support updates:
68-
* `backup` - Whether the load balancer should treat this server as a backup unit. If `true`, the load balancer forwards no ingress traffic to this backend server unless all other backend servers not marked as "backup" fail the health check policy. Example: `true`
69-
* `drain` - Whether the load balancer should drain this server. Servers marked "drain" receive no new incoming traffic. Example: `true`
70-
* `offline` - Whether the load balancer should treat this server as offline. Offline servers receive no incoming traffic. Example: `true`
71-
* `weight` - The load balancing policy weight assigned to the server. Backend servers with a higher weight receive a larger proportion of incoming traffic. For example, a server weighted '3' receives 3 times the number of new connections as a server weighted '1'. For more information on load balancing policies, see [How Load Balancing Policies Work](https://docs.us-phoenix-1.oraclecloud.com/Content/Balance/Reference/lbpolicies.htm). Example: `3`
68+
* `health_checker` -
7269
* `interval_ms` - The interval between health checks, in milliseconds. Example: `30000`
7370
* `port` - The backend server port against which to run the health check. If the port is not specified, the load balancer uses the port information from the `Backend` object. Example: `8080`
71+
* `protocol` - The protocol the health check must use; either HTTP or TCP. Example: `HTTP`
7472
* `response_body_regex` - A regular expression for parsing the response body from the backend server. Example: `^(500|40[1348])$`
7573
* `retries` - The number of retries to attempt before a backend server is considered "unhealthy". Example: `3`
7674
* `return_code` - The status code a healthy backend server should return. Example: `200`
7775
* `timeout_in_millis` - The maximum time, in milliseconds, to wait for a reply to a health check. A health check is successful only if a reply returns within this timeout period. Example: `6000`
7876
* `url_path` - The path against which to run the health check. Example: `/healthcheck`
77+
* `policy` - The load balancer policy for the backend set. To get a list of available policies, use the [ListPolicies](https://docs.us-phoenix-1.oraclecloud.com/api/#/en/loadbalancer/20170115/LoadBalancerPolicy/ListPolicies) operation. Example: `LEAST_CONNECTIONS`
7978
* `session_persistence_configuration` -
79+
* `cookie_name` - The name of the cookie used to detect a session initiated by the backend server. Use '*' to specify that any cookie set by the backend causes the session to persist. Example: `myCookieName`
8080
* `disable_fallback` - Whether the load balancer is prevented from directing traffic from a persistent session client to a different backend server if the original server is unavailable. Defaults to false. Example: `true`
8181
* `ssl_configuration` -
82+
* `certificate_name` - A friendly name for the certificate bundle. It must be unique and it cannot be changed. Valid certificate bundle names include only alphanumeric characters, dashes, and underscores. Certificate bundle names cannot contain spaces. Avoid entering confidential information. Example: `My_certificate_bundle`
8283
* `verify_depth` - The maximum depth for peer certificate chain verification. Example: `3`
8384
* `verify_peer_certificate` - Whether the load balancer listener should verify peer certificates. Example: `true`
8485

@@ -89,7 +90,7 @@ Any change to a property that does not support update will force the destruction
8990
### Example Usage
9091

9192
```
92-
resource "oci_load_balancer_backend_set" "test_backend_set" {
93+
resource "oci_load_balancer_backendset" "test_backend_set" {
9394
#Required
9495
health_checker {
9596
#Required
@@ -126,7 +127,7 @@ resource "oci_load_balancer_backend_set" "test_backend_set" {
126127
}
127128
```
128129

129-
# oci_load_balancer_backend_sets
130+
# oci_load_balancer_backendsets
130131

131132
## BackendSet DataSource
132133

@@ -146,7 +147,7 @@ The following attributes are exported:
146147
### Example Usage
147148

148149
```
149-
data "oci_load_balancer_backend_sets" "test_backend_sets" {
150+
data "oci_load_balancer_backendsets" "test_backend_sets" {
150151
#Required
151152
load_balancer_id = "${oci_load_balancer_load_balancer.test_load_balancer.id}"
152153
}

docs/load_balancer/backends.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,11 @@ The following arguments are supported:
3636
Updates the configuration of a backend server within the specified backend set.
3737

3838
The following arguments support updates:
39-
* NO arguments in this resource support updates
39+
* `backup` - Whether the load balancer should treat this server as a backup unit. If `true`, the load balancer forwards no ingress traffic to this backend server unless all other backend servers not marked as "backup" fail the health check policy. Example: `true`
40+
* `drain` - Whether the load balancer should drain this server. Servers marked "drain" receive no new incoming traffic. Example: `true`
41+
* `offline` - Whether the load balancer should treat this server as offline. Offline servers receive no incoming traffic. Example: `true`
42+
* `weight` - The load balancing policy weight assigned to the server. Backend servers with a higher weight receive a larger proportion of incoming traffic. For example, a server weighted '3' receives 3 times the number of new connections as a server weighted '1'. For more information on load balancing policies, see [How Load Balancing Policies Work](https://docs.us-phoenix-1.oraclecloud.com/Content/Balance/Reference/lbpolicies.htm). Example: `3`
43+
4044

4145
** IMPORTANT **
4246
Any change to a property that does not support update will force the destruction and recreation of the resource with the new property values

0 commit comments

Comments
 (0)