Merge pull request #2138 from oracle/release_gh

Releasing version 5.46.0

Author: ravinitp

CHANGELOG.md

@@ -70,10 +70,8 @@ variable defined_tag_namespace_name {
 
 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
+  auth = "SecurityToken"
+  config_file_profile = "terraform-federation-test"
 }
 
 resource "oci_identity_tag_namespace" "tag-namespace1" {
@@ -111,7 +109,7 @@ data "oci_kms_vault" "test_vault" {
 
 data "oci_kms_keys" "test_keys_dependency_RSA" {
   #Required
-  compartment_id = var.tenancy_ocid
+  compartment_id = var.compartment_ocid
   management_endpoint = data.oci_kms_vault.test_vault.management_endpoint
   algorithm = "RSA"
 
@@ -284,8 +282,8 @@ resource "oci_containerengine_node_pool" "test_flex_shape_node_pool" {
   compartment_id     = var.compartment_ocid
   kubernetes_version = reverse(data.oci_containerengine_cluster_option.test_cluster_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]
+  node_shape         = "VM.Standard.E4.Flex"
+  subnet_ids         = [oci_core_subnet.nodePool_Subnet_1.id]
 
   node_source_details {
     #Required
@@ -344,6 +342,7 @@ data "oci_containerengine_cluster_option" "test_cluster_option" {
 
 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" {

examples/container_engine/main.tf

@@ -46,7 +46,7 @@ variable "node_pool_node_shape" {
 }
 
 variable "node_pool_quantity_per_subnet" {
-  default = 2
+  default = 1
 }
 
 variable "node_pool_ssh_public_key" {

examples/container_engine/regional_subnet/variables.tf

@@ -19,6 +19,10 @@ variable "region" {
 variable "compartment_id" {
 }
 
+variable "alarm_summary" {
+  default = "test summary with severity = {{severity}} and query = {{{query}}}"
+}
+
 variable "alarm_body" {
   default = "High CPU utilization reached"
 }
@@ -39,6 +43,10 @@ variable "alarm_display_name" {
   default = "High CPU Utilization"
 }
 
+variable "alarm_evaluation_slack_duration" {
+  default = "PT5M"
+}
+
 variable "alarm_freeform_tags" {
   default = {
     "Department" = "Finance"
@@ -69,6 +77,10 @@ variable "alarm_pending_duration" {
   default = "PT5M"
 }
 
+variable "alarm_notification_title" {
+  default = "Sample title with severity {{severity}}"
+}
+
 variable "alarm_query" {
   default = "CpuUtilization[10m].percentile(0.9) < 85"
 }
@@ -172,9 +184,12 @@ resource "oci_monitoring_alarm" "test_alarm" {
   severity              = var.alarm_severity
 
   #Optional
+  alarm_summary                    = var.alarm_summary
   body                             = var.alarm_body
+  evaluation_slack_duration        = var.alarm_evaluation_slack_duration
   message_format                   = var.alarm_message_format
   metric_compartment_id_in_subtree = var.alarm_metric_compartment_id_in_subtree
+  notification_title               = var.alarm_notification_title
   notification_version             = var.alarm_notification_version
   overrides {
     body             = "90% CPU utilization."