Merge pull request #2235 from oracle/release_gh

Release gh v6.16.0

Author: ravinitp

CHANGELOG.md

@@ -333,11 +333,6 @@ data "oci_core_instance" "test_instance_pool_instance_singular_datasource" {
   instance_id = data.oci_core_instance_pool_instances.test_instance_pool_instances_datasource.instances[count.index]["id"]
 }
 
-data "oci_core_instance_pool_load_balancer_attachment" "test_instance_pool_load_balancer_attachment" {
-  instance_pool_id                          = oci_core_instance_pool.test_instance_pool.id
-  instance_pool_load_balancer_attachment_id = oci_core_instance_pool.test_instance_pool.load_balancers[0].id
-}
-
 output "pooled_instances_private_ips" {
   value = [data.oci_core_instance.test_instance_pool_instance_singular_datasource.*.private_ip]
 }
@@ -350,7 +345,3 @@ output "pooled_instances_hostname_labels" {
   value = [data.oci_core_instance.test_instance_pool_instance_singular_datasource.*.hostname_label]
 }
 
-output "load_balancer_backend_set_name" {
-  value = [data.oci_core_instance_pool_load_balancer_attachment.test_instance_pool_load_balancer_attachment.backend_set_name]
-}
-

examples/compute/instance_pool/instance_pool.tf

@@ -140,7 +140,7 @@ resource "oci_core_instance_configuration" "test_instance_configuration_ipv6" {
         assign_public_ip       = true
         display_name           = "TestInstanceConfigurationVNIC"
         skip_source_dest_check = false
-        subnet_id                 = oci_core_subnet.test_subnet.id
+        subnet_id                 = oci_core_subnet.test_subnet_ipv6.id
         assign_ipv6ip             = true
         ipv6address_ipv6subnet_cidr_pair_details {
           ipv6subnet_cidr = oci_core_subnet.test_subnet_ipv6.ipv6cidr_blocks[0]
@@ -161,7 +161,7 @@ resource "oci_core_instance_configuration" "test_instance_configuration_ipv6" {
     secondary_vnics {
       display_name = "TestInstancePoolSecondaryVNIC"
       create_vnic_details {
-        subnet_id = oci_core_subnet.test_subnet.id
+        subnet_id = oci_core_subnet.test_subnet_ipv6.id
         assign_ipv6ip = true
         display_name = "TestInstancePoolSecondaryVNIC"
         ipv6address_ipv6subnet_cidr_pair_details {

examples/compute/instance_pool/instance_pool_ipv6.tf

@@ -20,7 +20,7 @@ provider "oci" {
 }
 
 /*
-A complete example to setup a cluster, then configure add-ons, then create node pool.
+A complete example to setup a cluster, then configure add-ons.
 */
 data "oci_identity_availability_domain" "ad1" {
     compartment_id = var.tenancy_ocid
@@ -51,17 +51,16 @@ resource "oci_core_route_table" "test_route_table" {
     }
 }
 
-resource "oci_core_subnet" "nodePool_Subnet_1" {
-    #Required
-    availability_domain = data.oci_identity_availability_domain.ad1.name
-    cidr_block          = "10.0.22.0/24"
-    compartment_id      = var.compartment_ocid
-    vcn_id              = oci_core_vcn.test_vcn.id
-
-    # Provider code tries to maintain compatibility with old versions.
-    security_list_ids = [oci_core_vcn.test_vcn.default_security_list_id]
-    display_name      = "tfSubNet1ForNodePool"
-    route_table_id    = oci_core_route_table.test_route_table.id
+resource "oci_core_subnet" "api_endpoint_subnet" {
+  #Required
+  cidr_block          = "10.0.23.0/24"
+  compartment_id      = var.compartment_ocid
+  vcn_id              = oci_core_vcn.test_vcn.id
+
+  # Provider code tries to maintain compatibility with old versions.
+  security_list_ids = [oci_core_vcn.test_vcn.default_security_list_id]
+  display_name      = "apiEndpointSubnet"
+  route_table_id    = oci_core_route_table.test_route_table.id
 }
 
 resource "oci_containerengine_cluster" "test_cluster" {
@@ -71,6 +70,9 @@ resource "oci_containerengine_cluster" "test_cluster" {
     name               = "tfTestCluster"
     vcn_id             = oci_core_vcn.test_vcn.id
     type               = "ENHANCED_CLUSTER"
+    endpoint_config {
+      subnet_id = oci_core_subnet.api_endpoint_subnet.id
+    }
 }
 
 resource "oci_containerengine_addon" "dashboard" {
@@ -80,6 +82,11 @@ resource "oci_containerengine_addon" "dashboard" {
     cluster_id = oci_containerengine_cluster.test_cluster.id
     #Required, remove the resource on addon deletion
     remove_addon_resources_on_delete = true
+
+    #Optional, will override an existing installation if true and Addon already exists
+    override_existing = false
+
+    #Optional
     dynamic configurations {
         for_each = local.addon_mappings
 
@@ -90,60 +97,11 @@ resource "oci_containerengine_addon" "dashboard" {
         }
 }
 
-resource "oci_containerengine_node_pool" "test_node_pool" {
-    #Required
-    cluster_id         = oci_containerengine_cluster.test_cluster.id
-    compartment_id     = var.compartment_ocid
-    kubernetes_version = reverse(data.oci_containerengine_cluster_option.test_cluster_option.kubernetes_versions)[0]
-    name               = "tfPool"
-    node_shape         = "VM.Standard2.1"
-
-    node_config_details  {
-        size = 1
-        placement_configs {
-            availability_domain = data.oci_identity_availability_domain.ad1.name
-            subnet_id           = oci_core_subnet.nodePool_Subnet_1.id
-        }
-    }
-
-    node_source_details {
-        #Required
-        image_id    = local.image_id
-        source_type = "IMAGE"
-
-        #Optional
-        boot_volume_size_in_gbs = "60"
-    }
-
-    //use terraform depends_on to enforce cluster->add-on->node pool DAG
-    depends_on = [oci_containerengine_addon.dashboard]
-}
-
 data "oci_containerengine_cluster_option" "test_cluster_option" {
   cluster_option_id = "all"
 }
 
-data "oci_containerengine_node_pool_option" "test_node_pool_option" {
-  node_pool_option_id = "all"
-  compartment_id = var.compartment_ocid
-}
-
-data "oci_core_images" "shape_specific_images" {
-  #Required
-  compartment_id = var.tenancy_ocid
-  shape = "VM.Standard2.1"
-}
-
 locals {
-  all_images = "${data.oci_core_images.shape_specific_images.images}"
-  all_sources = "${data.oci_containerengine_node_pool_option.test_node_pool_option.sources}"
-
-  compartment_images = [for image in local.all_images : image.id if length(regexall("Oracle-Linux-[0-9]*.[0-9]*-20[0-9]*",image.display_name)) > 0 ]
-
-  oracle_linux_images = [for source in local.all_sources : source.image_id if length(regexall("Oracle-Linux-[0-9]*.[0-9]*-20[0-9]*",source.source_name)) > 0]
-
-  image_id = tolist(setintersection( toset(local.compartment_images), toset(local.oracle_linux_images)))[0]
-
   addon_mappings = {
         mapping1 = {
             key = "numOfReplicas"

examples/container_engine/addons/main.tf

@@ -409,6 +409,32 @@ resource "oci_network_load_balancer_backend_set" "nlb-bes3" {
   depends_on = [oci_network_load_balancer_backend_set.nlb-bes2]
 }
 
+resource "oci_network_load_balancer_backend_set" "nlb-bes4" {
+  name                     = "nlb-bes4"
+  network_load_balancer_id = oci_network_load_balancer_network_load_balancer.nlb1.id
+  policy                   = "THREE_TUPLE"
+  is_fail_open = false
+  is_instant_failover_enabled = true
+  is_preserve_source = true
+
+  health_checker {
+    port                = "53"
+    protocol            = "DNS"
+    timeout_in_millis   = 10000
+    interval_in_millis  = 10000
+    retries             = 3
+    dns {
+      domain_name = "oracle.com"
+      query_class = "IN"
+      query_type = "A"
+      rcodes = ["NOERROR", "SERVFAIL"]
+      transport_protocol = "UDP"
+    }
+  }
+  depends_on = [oci_network_load_balancer_backend_set.nlb-bes3]
+}
+
+
 resource "oci_network_load_balancer_listener" "nlb-listener1" {
   network_load_balancer_id    = oci_network_load_balancer_network_load_balancer.nlb1.id
   name                        = "tcp_listener"
@@ -417,7 +443,7 @@ resource "oci_network_load_balancer_listener" "nlb-listener1" {
   protocol                    = "TCP"
   tcp_idle_timeout            = 360
   is_ppv2enabled	          = true
-  depends_on = [oci_network_load_balancer_backend_set.nlb-bes3]
+  depends_on = [oci_network_load_balancer_backend_set.nlb-bes4]
 }
 
 resource "oci_network_load_balancer_listener" "nlb-listener2" {
@@ -441,6 +467,18 @@ resource "oci_network_load_balancer_listener" "nlb-listener3" {
   depends_on = [oci_network_load_balancer_listener.nlb-listener2]
 }
 
+resource "oci_network_load_balancer_listener" "nlb-listener4" {
+  network_load_balancer_id    = oci_network_load_balancer_network_load_balancer.nlb1.id
+  name                        = "l3_ip_listener"
+  default_backend_set_name    = oci_network_load_balancer_backend_set.nlb-bes4.name
+  port                        = 0
+  protocol                    = "L3IP"
+  tcp_idle_timeout            = 240
+  udp_idle_timeout            = 180
+  l3ip_idle_timeout           = 360
+  depends_on = [oci_network_load_balancer_listener.nlb-listener3]
+}
+
 resource "oci_network_load_balancer_backend" "nlb-be1" {
   network_load_balancer_id = oci_network_load_balancer_network_load_balancer.nlb1.id
   backend_set_name         = oci_network_load_balancer_backend_set.nlb-bes1.name
@@ -450,7 +488,7 @@ resource "oci_network_load_balancer_backend" "nlb-be1" {
   is_drain                 = false
   is_offline               = false
   weight                   = 1
-  depends_on = [oci_network_load_balancer_listener.nlb-listener3]
+  depends_on = [oci_network_load_balancer_listener.nlb-listener4]
 }
 
 resource "oci_network_load_balancer_backend" "nlb-be2" {

examples/globally_distributed_database/README.md

@@ -29,11 +29,11 @@ variable "schedule_freeform_tags" {
 }
 
 variable "schedule_recurrence_details" {
-  default = "recurrenceDetails"
+  default = "FREQ=DAILY;INTERVAL=1"
 }
 
 variable "schedule_recurrence_type" {
-  default = "CRON"
+  default = "ICAL"
 }
 
 variable "schedule_resource_filters_attribute" {
@@ -69,19 +69,18 @@ variable "schedule_resources_metadata" {
 }
 
 variable "schedule_state" {
-  default = "AVAILABLE"
+  default = "ACTIVE"
 }
 
 variable "schedule_time_ends" {
-  default = "timeEnds"
+  default = "2024-07-23T17:45:44.408Z"
 }
 
 variable "schedule_time_starts" {
-  default = "timeStarts"
+  default = "2024-07-13T17:45:44.408Z"
 }
 
 
-
 provider "oci" {
   tenancy_ocid     = var.tenancy_ocid
   user_ocid        = var.user_ocid
@@ -97,33 +96,38 @@ resource "oci_resource_scheduler_schedule" "test_schedule" {
   recurrence_details = var.schedule_recurrence_details
   recurrence_type    = var.schedule_recurrence_type
 
-  #Optional
-  defined_tags  = map(oci_identity_tag_namespace.tag-namespace1.name.oci_identity_tag.tag1.name, var.schedule_defined_tags_value)
-  description   = var.schedule_description
-  display_name  = var.schedule_display_name
-  freeform_tags = var.schedule_freeform_tags
   resource_filters {
-    #Required
-    attribute = var.schedule_resource_filters_attribute
-
-    #Optional
-    condition                         = var.schedule_resource_filters_condition
-    should_include_child_compartments = var.schedule_resource_filters_should_include_child_compartments
+    # Required
+    attribute = "DEFINED_TAGS"
     value {
-
-      #Optional
-      namespace = var.schedule_resource_filters_value_namespace
-      tag_key   = var.schedule_resource_filters_value_tag_key
-      value     = var.schedule_resource_filters_value_value
+      namespace="ResourceSchedulerCanary"
+      tag_key="ScheduleTagFilterTestKey"
+      value="foo"
     }
   }
-  resources {
-    #Required
-    id = var.schedule_resources_id
-
-    #Optional
-    metadata = var.schedule_resources_metadata
+  resource_filters {
+    # Required
+    attribute = "LIFECYCLE_STATE"
+    value {
+      value="running"
+    }
+    value {
+      value="stopped"
+    }
+  }
+  resource_filters {
+    # Required
+    attribute = "COMPARTMENT_ID"
+    value {
+      value=var.compartment_id
+    }
   }
+
+  #Optional
+  defined_tags  = map(oci_identity_tag_namespace.tag-namespace1.name.oci_identity_tag.tag1.name, var.schedule_defined_tags_value)
+  description   = var.schedule_description
+  display_name  = var.schedule_display_name
+  freeform_tags = var.schedule_freeform_tags
   time_ends   = var.schedule_time_ends
   time_starts = var.schedule_time_starts
 }