Merge pull request #1881 from oracle/release_gh

Releasing version 4.123.0

Author: Maxrovr

CHANGELOG.md

@@ -1,3 +1,15 @@
+## 4.123.0 (May 31, 2023)
+
+### Added
+- Support for move db operation
+- Support for DBM Service: External Exadata Infrastructure Monitoring
+- Support for FSS Policy-Based Snapshots
+- Support for Instance Configuration feature parity improvement March 2021 Compute: Instance Configuration feature parity with downstream APIs
+- support for string to float32 conversion
+### Bug Fix
+- Add polling for PDB resources.
+- trigger recreation while change subnet_id for endpoint config and ignore order in configurations for addons
+
 ## 4.122.0 (May 24, 2023)
 
 ### Added

examples/compute/instance_pool/instance_pool.tf

@@ -175,11 +175,16 @@ resource "oci_core_instance_configuration" "test_instance_configuration" {
     */
     block_volumes {
       create_details {
-        compartment_id      = var.compartment_ocid
-        display_name        = "TestCreateVolumeDetails-1"
-        availability_domain = data.oci_identity_availability_domain.ad.name
-        size_in_gbs         = 50
-        vpus_per_gb         = 20 // min vpus
+        compartment_id       = var.compartment_ocid
+        display_name         = "TestCreateVolumeDetails-1"
+        availability_domain  = data.oci_identity_availability_domain.ad.name
+        size_in_gbs          = 50
+        vpus_per_gb          = 20 // min vpus
+        is_auto_tune_enabled = false
+        block_volume_replicas {
+          display_name        = "TestCreateVolumeDetails-1"
+          availability_domain = data.oci_identity_availability_domain.ad.name
+        }
       }
 
       attach_details {
@@ -221,6 +226,11 @@ resource "oci_core_instance_configuration" "test_instance_configuration" {
         is_monitoring_disabled = false
       }
 
+      availability_config {
+        recovery_action             = "RESTORE_INSTANCE"
+        is_live_migration_preferred = false
+      }
+
       launch_options {
         network_type = "PARAVIRTUALIZED"
       }

examples/container_engine/addons/main.tf

@@ -1,68 +1,39 @@
 // Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
 // Licensed under the Mozilla Public License v2.0
-
-variable "tenancy_ocid" {
+variable "user_ocid" {
 }
 
-variable "cluster_id" {
-
+variable "fingerprint" {
 }
 
-variable "kubernetes_version" {
-
+variable "private_key_path" {
 }
 
-variable "compartment_ocid" {
+variable "region" {
+  default = "us-ashburn-1"
 }
 
-variable "image_id" {
 
+variable "tenancy_ocid" {
 }
 
-data "oci_containerengine_addon_options" "all" {
-    #Required
-    kubernetes_version = var.kubernetes_version
-}
+variable "cluster_id" {
 
-data "oci_containerengine_addon_options" "name_filter_example" {
-    #Required
-    kubernetes_version = var.kubernetes_version
-    #Optional, a name uniquely identifies an add-on, see all supported add-on names in data.oci_containerengine_addon_options.all.addon_options
-    addon_name = "KubernetesDashboard"
 }
 
-resource "oci_containerengine_addon" "addon_resource_example" {
-    #Required, a name uniquely identifies an add-on, see all supported add-on names in data.oci_containerengine_addon_options.all.addon_options
-    addon_name = "KubernetesDashboard"
-    #Required
-    cluster_id = var.cluster_id
-    #Required, false values keeps installed resources of the addon on deletion. Set to true to fully remove resources
-    remove_addon_resources_on_delete = true
-
-    /*
-    configurations that are supported by the add-on specified by the addon_name, see all supported configurations in in data.oci_containerengine_addon_options.all.addon_options.
-    Unless required by a specific add-on, most of add-ons only have optional configurations that allow customization.
-    */
-     configurations {
+variable "kubernetes_version" {
 
-     }
-    /*
-    Optional, see all supported version in in data.oci_containerengine_addon_options.all.addon_options.
-    It is highly recommended to not set this field to let service choose and manage addon version.
-    */
-    version = "v1.0.0"
 }
 
-data "oci_containerengine_addons" "addon_addon_data_source_list_example" {
-    #Required
-    cluster_id = var.cluster_id
+variable "compartment_ocid" {
 }
 
-data "oci_containerengine_addon" "addon_data_source_singular_example" {
-    #Required
-    cluster_id = var.cluster_id
-    #Required, a name uniquely identifies an add-on, see all supported add-on names in data.oci_containerengine_addon_options.all.addon_options
-    addon_name = "KubernetesDashboard"
+provider "oci" {
+  region           = var.region
+  tenancy_ocid     = var.tenancy_ocid
+  user_ocid        = var.user_ocid
+  fingerprint      = var.fingerprint
+  private_key_path = var.private_key_path
 }
 
 /*
@@ -113,7 +84,7 @@ resource "oci_core_subnet" "nodePool_Subnet_1" {
 resource "oci_containerengine_cluster" "test_cluster" {
     #Required
     compartment_id     = var.compartment_ocid
-    kubernetes_version = var.kubernetes_version
+    kubernetes_version = reverse(data.oci_containerengine_cluster_option.test_cluster_option.kubernetes_versions)[0]
     name               = "tfTestCluster"
     vcn_id             = oci_core_vcn.test_vcn.id
     type               = "ENHANCED_CLUSTER"
@@ -126,13 +97,21 @@ 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
+    dynamic configurations {
+        for_each = local.addon_mappings
+
+        content {
+            key =configurations.value.key
+            value = configurations.value.value
+            }
+        }
 }
 
 resource "oci_containerengine_node_pool" "test_node_pool" {
     #Required
     cluster_id         = oci_containerengine_cluster.test_cluster.id
     compartment_id     = var.compartment_ocid
-    kubernetes_version = var.kubernetes_version
+    kubernetes_version = reverse(data.oci_containerengine_cluster_option.test_cluster_option.kubernetes_versions)[0]
     name               = "tfPool"
     node_shape         = "VM.Standard2.1"
 
@@ -146,7 +125,7 @@ resource "oci_containerengine_node_pool" "test_node_pool" {
 
     node_source_details {
         #Required
-        image_id    = var.image_id
+        image_id    = local.image_id
         source_type = "IMAGE"
 
         #Optional
@@ -155,4 +134,40 @@ resource "oci_containerengine_node_pool" "test_node_pool" {
 
     //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"
+}
+
+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"
+            value = "1"
+        }
+        mapping2 = {
+            key = "nodeSelectors"
+            value = "{\"pool\":\"system\"}"
+        }
+  }
 }

examples/container_engine/main.tf

@@ -166,7 +166,7 @@ resource "oci_core_subnet" "nodePool_Subnet_2" {
 resource "oci_containerengine_cluster" "test_cluster" {
   #Required
   compartment_id     = var.compartment_ocid
-  kubernetes_version = data.oci_containerengine_cluster_option.test_cluster_option.kubernetes_versions[0]
+  kubernetes_version = reverse(data.oci_containerengine_cluster_option.test_cluster_option.kubernetes_versions)[0]
   name               = "tfTestCluster"
   vcn_id             = oci_core_vcn.test_vcn.id
 

examples/database/db_systems/db_exacs/resources.tf

@@ -137,4 +137,29 @@ resource "oci_database_application_vip" "test_application_vip" {
 
     #Optional
     db_node_id          = data.oci_database_db_nodes.db_nodes.db_nodes[0]["id"]
+}
+
+resource "oci_database_database" "test_database" {
+  #Required
+  database {
+    admin_password = "BEstrO0ng_#11"
+    db_name        = "TFdb2Exa"
+    character_set  = "AL32UTF8"
+    ncharacter_set = "AL16UTF16"
+    db_workload    = "OLTP"
+
+    db_backup_config {
+      auto_backup_enabled = false
+    }
+  }
+
+  db_home_id = oci_database_db_home.test_db_home_vm_cluster_no_db.id
+  source     = "NONE"
+}
+
+resource "oci_database_pluggable_database" "test_pluggable_database" {
+        container_database_id = oci_database_database.test_database.id
+        pdb_admin_password = "BEstrO0ng_#11"
+        pdb_name = "SalesPdb"
+        tde_wallet_password = "BEstrO0ng_#11"
 }