Skip to content

Commit a759718

Browse files
authored
Merge pull request #2107 from oracle/release_gh
Releasing OCI Provider v5.41.0
2 parents ac30dbd + 542827a commit a759718

File tree

228 files changed

+3787
-168
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

228 files changed

+3787
-168
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions

examples/load_balancer/lb_full/lb_full.tf

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ variable "availability_domain" {
6565
}
6666

6767
provider "oci" {
68+
#version = "5.29.0"
6869
tenancy_ocid = var.tenancy_ocid
6970
user_ocid = var.user_ocid
7071
fingerprint = var.fingerprint
@@ -73,12 +74,12 @@ provider "oci" {
7374
}
7475

7576
data "oci_identity_availability_domain" "ad1" {
76-
compartment_id = var.tenancy_ocid // needs to be compartment_ocid if not using root compartment
77+
compartment_id = var.compartment_ocid // needs to be compartment_ocid if not using root compartment
7778
ad_number = 1
7879
}
7980

8081
data "oci_identity_availability_domain" "ad2" {
81-
compartment_id = var.tenancy_ocid // needs to be compartment_ocid if not using root compartment
82+
compartment_id = var.compartment_ocid // needs to be compartment_ocid if not using root compartment
8283
ad_number = 2
8384
}
8485

@@ -268,6 +269,8 @@ resource "oci_load_balancer" "lb1" {
268269
reserved_ips {
269270
id = oci_core_public_ip.test_reserved_ip.id
270271
}
272+
273+
is_delete_protection_enabled = "false"
271274
}
272275

273276
resource "oci_load_balancer" "lb2" {
@@ -326,6 +329,7 @@ resource "oci_load_balancer_backend_set" "lb-bes1" {
326329
name = "lb-bes1"
327330
load_balancer_id = oci_load_balancer.lb1.id
328331
policy = "ROUND_ROBIN"
332+
backend_max_connections = "1000"
329333

330334
health_checker {
331335
port = "80"
@@ -500,6 +504,7 @@ resource "oci_load_balancer_backend" "lb-be1" {
500504
drain = false
501505
offline = false
502506
weight = 1
507+
max_connections = 300
503508
}
504509

505510
resource "oci_load_balancer_backend" "lb-be2" {
@@ -511,6 +516,7 @@ resource "oci_load_balancer_backend" "lb-be2" {
511516
drain = false
512517
offline = false
513518
weight = 1
519+
max_connections = 450
514520
}
515521

516522
resource "oci_load_balancer_rule_set" "test_rule_set" {
@@ -571,6 +577,26 @@ resource "oci_load_balancer_rule_set" "test_rule_set" {
571577
name = "example_rule_set_name"
572578
}
573579

580+
resource "oci_load_balancer_rule_set" "ip_based_max_connections_ruleset" {
581+
load_balancer_id = oci_load_balancer.lb2.id
582+
name = "ip_based_max_connections_ruleset"
583+
584+
items {
585+
action = "IP_BASED_MAX_CONNECTIONS"
586+
default_max_connections = 20
587+
588+
ip_max_connections {
589+
ip_addresses = ["10.10.1.0/24", "150.136.187.0/24"]
590+
max_connections = 300
591+
}
592+
593+
ip_max_connections {
594+
ip_addresses = ["10.10.2.0/24", "151.0.0.0/8"]
595+
max_connections = 10
596+
}
597+
}
598+
}
599+
574600
output "lb_public_ip" {
575601
value = [oci_load_balancer.lb1.ip_address_details]
576602
}

examples/zips/adm.zip

0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

examples/zips/aiDocument.zip

0 Bytes
Binary file not shown.

examples/zips/aiLanguage.zip

0 Bytes
Binary file not shown.

examples/zips/aiVision.zip

0 Bytes
Binary file not shown.

examples/zips/always_free.zip

0 Bytes
Binary file not shown.

examples/zips/analytics.zip

0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)