Merge pull request #1825 from oracle/release_gh

Releasing version 4.114.0

Author: Maxrovr

CHANGELOG.md

@@ -1,3 +1,16 @@
+## 4.114.0 (March 29, 2023)
+
+### Added
+- Support for ACD & OKV Wallet Naming | ADB-D & ADB-C@C
+- Support for BDS - On Demand Bootstrap script execution (Only existing API changes)
+- Support for SCM: Support validating the credentials of the connection
+- Support for RDMA Network Instances
+- Support for Enhanced Cluster/Serverless/Cluster AddOns
+### Bug Fix
+- Fixed oci_database_db_home resource documentation.
+- support for metric extraction in Scheduled task and is_enabled field in object collection rule
+- multiple terminating lifescyle states issue for integration test
+
 ## 4.113.0 (March 22, 2023)
 
 ### Added

examples/big_data_service/main.tf

@@ -114,6 +114,9 @@ variable "bds_instance_state" {
   default = "ACTIVE"
 }
 
+data "oci_core_services" "test_bds_services" {
+}
+
 #Uncomment this when running in home region (PHX)
 #variable "tag_namespace_description" {
 #  default = "Just a test"
@@ -155,6 +158,30 @@ resource "oci_core_vcn" "vcn_bds" {
   dns_label      = "bdsvcn"
 }
 
+resource "oci_core_service_gateway" "export_sgw" {
+  compartment_id = var.compartment_id
+  display_name   = "sgw"
+
+  services {
+    service_id = data.oci_core_services.test_bds_services.services[0]["id"]
+  }
+
+  vcn_id = oci_core_vcn.vcn_bds.id
+}
+
+resource "oci_core_route_table" "private_rt" {
+  compartment_id = var.compartment_id
+  display_name   = "private-rt"
+
+  route_rules {
+    destination       = data.oci_core_services.test_bds_services.services[0]["cidr_block"]
+    destination_type  = "SERVICE_CIDR_BLOCK"
+    network_entity_id = oci_core_service_gateway.export_sgw.id
+  }
+
+  vcn_id = oci_core_vcn.vcn_bds.id
+}
+
 resource "oci_core_subnet" "regional_subnet_bds" {
   cidr_block        = "111.111.0.0/24"
   display_name      = "regionalSubnetBds"
@@ -177,6 +204,7 @@ resource "oci_bds_bds_instance" "test_bds_instance" {
   is_secure              = var.bds_instance_is_secure
   kms_key_id             = var.kms_key_id
   cluster_profile        = var.cluster_profile
+  bootstrap_script_url = "https://objectstorage.us-ashburn-1.oraclecloud.com/p/5M6CdCgyfNKcMGvdSIdK20tC9TAf0mVFkMsSlMdmmCaKusIX3DVixBS-_oDhJoxi/n/oraclebigdatadb/b/bootstrap-script-sdk-test/o/bootstrapScriptTemplate1bootstrapScript1.sh"
 
   master_node {
     #Required

examples/container_engine/addons/main.tf

@@ -0,0 +1,158 @@
+// Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+variable "tenancy_ocid" {
+}
+
+variable "cluster_id" {
+
+}
+
+variable "kubernetes_version" {
+
+}
+
+variable "compartment_ocid" {
+}
+
+variable "image_id" {
+
+}
+
+data "oci_containerengine_addon_options" "all" {
+    #Required
+    kubernetes_version = var.kubernetes_version
+}
+
+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 {
+
+     }
+    /*
+    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
+}
+
+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"
+}
+
+/*
+A complete example to setup a cluster, then configure add-ons, then create node pool.
+*/
+data "oci_identity_availability_domain" "ad1" {
+    compartment_id = var.tenancy_ocid
+    ad_number      = 1
+}
+
+resource "oci_core_vcn" "test_vcn" {
+    cidr_block     = "10.0.0.0/16"
+    compartment_id = var.compartment_ocid
+    display_name   = "tfVcnForClusters"
+}
+
+resource "oci_core_internet_gateway" "test_ig" {
+    compartment_id = var.compartment_ocid
+    display_name   = "tfClusterInternetGateway"
+    vcn_id         = oci_core_vcn.test_vcn.id
+}
+
+resource "oci_core_route_table" "test_route_table" {
+    compartment_id = var.compartment_ocid
+    vcn_id         = oci_core_vcn.test_vcn.id
+    display_name   = "tfClustersRouteTable"
+
+    route_rules {
+        destination       = "0.0.0.0/0"
+        destination_type  = "CIDR_BLOCK"
+        network_entity_id = oci_core_internet_gateway.test_ig.id
+    }
+}
+
+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_containerengine_cluster" "test_cluster" {
+    #Required
+    compartment_id     = var.compartment_ocid
+    kubernetes_version = var.kubernetes_version
+    name               = "tfTestCluster"
+    vcn_id             = oci_core_vcn.test_vcn.id
+    type               = "ENHANCED_CLUSTER"
+}
+
+resource "oci_containerengine_addon" "dashboard" {
+    #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 = oci_containerengine_cluster.test_cluster.id
+    #Required, remove the resource on addon deletion
+    remove_addon_resources_on_delete = true
+}
+
+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
+    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    = var.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]
+}

examples/container_engine/main.tf

@@ -155,7 +155,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
 
@@ -180,7 +180,7 @@ resource "oci_containerengine_cluster" "test_cluster" {
 
     admission_controller_options {
       #Optional
-      is_pod_security_policy_enabled = true
+      is_pod_security_policy_enabled = false
     }
 
     kubernetes_network_config {
@@ -195,10 +195,10 @@ resource "oci_containerengine_node_pool" "test_node_pool" {
   #Required
   cluster_id         = oci_containerengine_cluster.test_cluster.id
   compartment_id     = var.compartment_ocid
-  kubernetes_version = data.oci_containerengine_node_pool_option.test_node_pool_option.kubernetes_versions[0]
+  kubernetes_version = reverse(data.oci_containerengine_node_pool_option.test_node_pool_option.kubernetes_versions)[0]
   name               = "tfPool"
   node_shape         = "VM.Standard2.1"
-  subnet_ids         = [oci_core_subnet.nodePool_Subnet_1.id, oci_core_subnet.nodePool_Subnet_2.id]
+  subnet_ids         = [oci_core_subnet.nodePool_Subnet_1.id]
 
   #Optional
   initial_node_labels {
@@ -222,18 +222,18 @@ resource "oci_containerengine_node_pool" "test_node_pool" {
     boot_volume_size_in_gbs = "60"
   }
 
-  quantity_per_subnet = 2
+  quantity_per_subnet = 1
   ssh_public_key      = var.node_pool_ssh_public_key
 }
 
 resource "oci_containerengine_node_pool" "test_flex_shape_node_pool" {
   #Required
   cluster_id         = oci_containerengine_cluster.test_cluster.id
   compartment_id     = var.compartment_ocid
-  kubernetes_version = data.oci_containerengine_node_pool_option.test_node_pool_option.kubernetes_versions[0]
+  kubernetes_version = reverse(data.oci_containerengine_node_pool_option.test_node_pool_option.kubernetes_versions)[0]
   name               = "flexShapePool"
   node_shape         = "VM.Standard.E3.Flex"
-  subnet_ids         = [oci_core_subnet.nodePool_Subnet_1.id, oci_core_subnet.nodePool_Subnet_2.id]
+  subnet_ids         = [oci_core_subnet.nodePool_Subnet_1.id]
 
   node_source_details {
     #Required
@@ -246,7 +246,7 @@ resource "oci_containerengine_node_pool" "test_flex_shape_node_pool" {
     memory_in_gbs = 40
   }
 
-  quantity_per_subnet = 2
+  quantity_per_subnet = 1
   ssh_public_key      = var.node_pool_ssh_public_key
 }