Merge pull request #1751 from oracle/release_gh

Releasing v4.104.0

Author: vsin12

CHANGELOG.md

@@ -1,3 +1,14 @@
+## 4.104.0 (January 18, 2023)
+
+### Added
+- Support for ExaCS Private DNS Integration
+- Support for Configurable timeouts to OCI Service Mesh
+- Support for ExaCC Multi-Rack storage expansion
+- Support for ODSC - Model Store - Model Versioning
+- Support for FSS : Support for cross region replication
+### Bug Fix
+- Fix for timeout urls
+- Fix for container repository resource discovery
 ## 4.103.0 (January 11, 2023)
 
 ### Added

examples/artifacts/Repositories/repository.tf

@@ -6,7 +6,7 @@ variable "user_ocid" {}
 variable "fingerprint" {}
 variable "private_key_path" {}
 variable "region" {}
-variable "compartment_id" {}
+variable "compartment_ocid" {}
 
 provider "oci" {
   tenancy_ocid     = var.tenancy_ocid
@@ -18,7 +18,7 @@ provider "oci" {
 
 resource "oci_artifacts_repository" "test_repository" {
   #Required
-  compartment_id  = var.compartment_id
+  compartment_id  = var.compartment_ocid
   is_immutable    = false
   repository_type = "GENERIC"
 }
@@ -48,7 +48,7 @@ resource "oci_artifacts_generic_artifact" "test_artifact_by_source" {
 
 data "oci_artifacts_repositories" "test_repositories" {
   #Required
-  compartment_id = var.compartment_id
+  compartment_id = var.compartment_ocid
   state = "AVAILABLE"
 }
 

examples/database/db_systems/db_exacs/datasources.tf

@@ -20,6 +20,10 @@ data "oci_database_cloud_vm_cluster_iorm_config" "test_cloud_vm_cluster_iorm_con
   cloud_vm_cluster_id = oci_database_cloud_vm_cluster_iorm_config.test_cloud_vm_cluster_iorm_config.cloud_vm_cluster_id
 }
 
+data "oci_identity_tenancy" "tenancy" {
+  tenancy_id = var.tenancy_ocid
+}
+
 data "oci_database_db_servers" "test_cloud_db_servers" {
   #Required
   compartment_id            = var.compartment_ocid

examples/database/db_systems/db_exacs/network.tf

@@ -114,3 +114,29 @@ resource "oci_core_network_security_group" "test_network_security_group_backup"
   vcn_id         = oci_core_vcn.vcn.id
   display_name   = "displayName"
 }
+
+resource "oci_dns_zone" "test_zone" {
+  compartment_id = var.compartment_ocid
+  name           = "sicdbaas.exacs.zonetest"
+  zone_type      = "PRIMARY"
+  scope          = "PRIVATE"
+  view_id        = oci_dns_view.test_view.id
+}
+
+resource "oci_dns_view" "test_view" {
+  compartment_id = var.compartment_ocid
+  scope          = "PRIVATE"
+}
+
+resource "oci_dns_resolver" "test_resolver" {
+  attached_views {
+    view_id = oci_dns_view.test_view.id
+  }
+  display_name = "test_resolver"
+  resolver_id = data.oci_core_vcn_dns_resolver_association.test_vcn_dns_resolver_association.dns_resolver_id
+  scope = "PRIVATE"
+}
+
+data "oci_core_vcn_dns_resolver_association" "test_vcn_dns_resolver_association" {
+  vcn_id = "${oci_core_vcn.vcn.id}"
+}

examples/database/db_systems/db_exacs/resources.tf

@@ -19,7 +19,7 @@ resource "oci_database_cloud_vm_cluster" "test_cloud_vm_cluster" {
   compartment_id                  = var.compartment_ocid
   cpu_core_count                  = var.cloud_vm_cluster_cpu_core_count
   display_name                    = "MyTFVmClusterExaCs"
-  domain                          = oci_core_subnet.subnet.subnet_domain_name
+  domain                          = oci_dns_zone.test_zone.name
   gi_version                      = var.cloud_vm_cluster_gi_version
   hostname                        = var.cloud_vm_cluster_hostname
   ssh_public_keys                 = [var.ssh_public_key]
@@ -33,6 +33,7 @@ resource "oci_database_cloud_vm_cluster" "test_cloud_vm_cluster" {
   ocpu_count                      = var.cloud_vm_cluster_ocpu_count
   scan_listener_port_tcp          = var.cloud_vm_cluster_scan_listener_port_tcp
   scan_listener_port_tcp_ssl      = var.cloud_vm_cluster_scan_listener_port_tcp_ssl
+  private_zone_id                 = oci_dns_zone.test_zone.id
 
   data_collection_options {
     #Optional

examples/database/exadata_cc/exadata-infrastructure.tf

@@ -48,6 +48,7 @@ resource "oci_database_exadata_infrastructure" "test_exadata_infrastructure" {
   storage_count               = 3
   compute_count               = 2
   is_cps_offline_report_enabled = false
+  is_multi_rack_deployment      = false
 
   #Optional
   contacts {

examples/database/exadata_cc/multi_rack_sar_file_storage.json

@@ -0,0 +1,118 @@
+{
+  "generation" : "X8M",
+  "total racks" : 2,
+  "total compute" : 2,
+  "total storage" : 10,
+  "total existing racks" : 1,
+  "total existing compute" : 2,
+  "total existing storage" : 3,
+  "racks" :
+  [
+    {
+      "rack_num" : 1,
+      "new rack" : "yes",
+      "number compute" : 0,
+      "number storage" : 7,
+      "existing compute" : 0,
+      "existing storage" : 0,
+      "components" :
+      [
+        {
+          "type" : "spine",
+          "uloc" : 1,
+          "uheight" : 1,
+          "new component" : "yes"
+        },
+        {
+          "type" : "storage",
+          "uloc" : 2,
+          "uheight" : 2,
+          "new component" : "yes"
+        },
+        {
+          "type" : "storage",
+          "uloc" : 4,
+          "uheight" : 2,
+          "new component" : "yes"
+        },
+        {
+          "type" : "storage",
+          "uloc" : 6,
+          "uheight" : 2,
+          "new component" : "yes"
+        },
+        {
+          "type" : "storage",
+          "uloc" : 8,
+          "uheight" : 2,
+          "new component" : "yes"
+        },
+        {
+          "type" : "storage",
+          "uloc" : 10,
+          "uheight" : 2,
+          "new component" : "yes"
+        },
+        {
+          "type" : "storage",
+          "uloc" : 12,
+          "uheight" : 2,
+          "new component" : "yes"
+        },
+        {
+          "type" : "storage",
+          "uloc" : 14,
+          "uheight" : 2,
+          "new component" : "yes"
+        }
+      ]
+    },
+    {
+      "rack_num" : 2,
+      "new rack" : "no",
+      "number compute" : 2,
+      "number storage" : 3,
+      "existing compute" : 2,
+      "existing storage" : 3,
+      "components" :
+      [
+        {
+          "type" : "spine",
+          "uloc" : 1,
+          "uheight" : 1,
+          "new component" : "no"
+        },
+        {
+          "type" : "storage",
+          "uloc" : 2,
+          "uheight" : 2,
+          "new component" : "no"
+        },
+        {
+          "type" : "storage",
+          "uloc" : 4,
+          "uheight" : 2,
+          "new component" : "no"
+        },
+        {
+          "type" : "storage",
+          "uloc" : 6,
+          "uheight" : 2,
+          "new component" : "yes"
+        },
+        {
+          "type" : "compute",
+          "uloc" : 16,
+          "uheight" : 1,
+          "new component" : "no"
+        },
+        {
+          "type" : "compute",
+          "uloc" : 17,
+          "uheight" : 1,
+          "new component" : "no"
+        }
+      ]
+    }
+  ]
+}

examples/service_mesh/ingress_gateway_route_table.tf

@@ -28,6 +28,7 @@ resource "oci_service_mesh_ingress_gateway_route_table" "test_ingress_gateway_ro
     is_path_rewrite_enabled = local.ingress_gateway_route_table_route_rules_is_path_rewrite_enabled
     path                    = local.ingress_gateway_route_table_route_rules_path
     path_type               = local.ingress_gateway_route_table_route_rules_path_type
+    request_timeout_in_ms   = local.ingress_gateway_route_table_route_rules_request_timeout_in_ms
   }
 
   #Optional
@@ -66,4 +67,5 @@ locals {
   ingress_gateway_route_table_route_rules_ingress_gateway_host_name = "test-host"
   ingress_gateway_route_table_route_rules_ingress_gateway_host_port = "2000"
   // allowed values for above are between 1024 and 65535
-}
+  ingress_gateway_route_table_route_rules_request_timeout_in_ms     = 100
+}

examples/service_mesh/service_dependencies.tf

@@ -5,7 +5,11 @@ resource "oci_certificates_management_ca_bundle" "test_ca_bundle" {
   name           = local.ca_bundle_name
 }
 
+resource "random_id" "id" {
+  byte_length = 8
+}
+
 locals {
-  ca_bundle_name                                                 = "test-ca-bundle"
-  ca_bundle_ca_bundle_pem                                        = "-----BEGIN CERTIFICATE-----\nMIICwjCCAaqgAwIBAgICEAAwDQYJKoZIhvcNAQELBQAwFzEVMBMGA1UEAwwMdGVz\ndC1yb290LWNhMB4XDTIwMDkxMTIyMjczMFoXDTIxMDkxMTIyMjczMFowHzEdMBsG\nA1UEAwwUdGVzdC1pbnRlcm1lZGlhdGUtY2EwggEiMA0GCSqGSIb3DQEBAQUAA4IB\nDwAwggEKAoIBAQDoGijYmLa6P+2C2hcXV7DNBuZ0K+1x41lC8emin9d6wsxsWYJn\nUzthLgJ28eol9CsDQlgRt+rGfYzKgfG7y7Wg7WYQXFHYZt1ANRB0OEVJYm7xurMA\nw6T68gBBctbLCcsk2WmWKp50Js7bwMKGGpCuDQ3YGWb1Bn1cu1qC9eWxl+VXV7RU\nMug1CtloLLrUlZt3FjbKBZEhhq4L6ukKTfNUzAofu4Q0ACxWht7ueuJMWaAaOUR2\nHu5KuGjkiJLvW/wRFeN55+rtuh9Bw/fKnhEq5/q9VCmw4g9sfNO0wIUqBhYx8etF\nYsGww1FWOEtGdUDv8NazYowPdpDwZzWA9UaPAgMBAAGjEDAOMAwGA1UdEwQFMAMB\nAf8wDQYJKoZIhvcNAQELBQADggEBAIrr04h+LmTM/JXEE/7kD8sB77YQhkbaWZPV\nuOwgdwVldAaGJkp4nyFPgcm+W7AXuoMMCq1ONNQuic2voopGU3EFng/tGODdYxiR\nedHyRPX23tJF19MSIJebJ7PNu2LtUU7tQspf4yqt4sBxW0nwjjSNyxPIZdnjNgFG\nHqpGgfIS9rSm89A6XRhwLSiudsQV/bfdHOgYUNuaPZn5LiyxHvHAorsZ1rpymNa6\nL78Mn4YLEBIT6XftA67z9g9N963FhGM0Il2iUVXm4HU/XqM26s94ZHlCIVJnV5xQ\nmjUvxEKNZMc7CRgz1Mr0Am898gQQZZrySHpDNvhpP50OeYH9/mU=\n-----END CERTIFICATE-----`, Update: `-----BEGIN CERTIFICATE-----\n\nMIICwTCCAamgAwIBAgIJAMz8Puud7CUcMA0GCSqGSIb3DQEBCwUAMBcxFTATBgNV\nBAMMDHRlc3Qtcm9vdC1jYTAeFw0yMDA5MTEyMjI3MzBaFw0zMDA5MDkyMjI3MzBa\nMBcxFTATBgNVBAMMDHRlc3Qtcm9vdC1jYTCCASIwDQYJKoZIhvcNAQEBBQADggEP\nADCCAQoCggEBALQql3DFigzMMlTXGJlz4ulZJx3kPmCySwl2rzZ+jZhMF8Oy/5xn\n99ToHgbj+Pp/7XWuogtwkfoZYmU1BTHyjZlaNccTLwkP/4SkjZ7cKsv4TTCN0q/4\nZF6dVoQOom/owREX4YEnISUgN4U5vpZkzkr3NOpiULAmimrROq52TcC2y52ijui9\nSf7QDmtVW7M4kUFjT+If/2yxX/g1dsbKxh+cuZimLWypD3TmhWehglgEZRiDnXJL\n7davAG0DOeO2scnglOY0JAOyM6po4WALmBf6OBxl2jiYpwWgkXMhgGf5u3ID6IDP\nJ2ZeYb9PZ2Z5jYGxUDLRVaaXr0a4a4UbvuECAwEAAaMQMA4wDAYDVR0TBAUwAwEB\n/zANBgkqhkiG9w0BAQsFAAOCAQEATqNEMvk7NUi6M9tv743CVGZa9JLdpdD9ZCbY\nvH6qEl5nVVAiUiKCRSnntDNtUkFd9tVQGk5Hgp2aMm1epq6kC3N0K4Dbsg1dWU4O\nYRG47CSv+sBI4VpDqRjtOS3+FlmMlm237ahs7YcwHNUqqGKbl9QZACxXZeCArYhZ\nt6xDqLb0gKON5gKlhnUqhYTT4+CcBan2nnr7sbdZhwtOmFgrowvs4OVh6WwdbI9m\nSdNKzy7AXAlcodkXAfjIoODeOQdEK6/Ine1K+W4sOk9e+oymoD0KnzhDLI3MDB3V\nGKIiVcct3DMHGI+y04/kcuasqUo4l6lrjt2wJF1pHbaxKIcyGQ==\n-----END CERTIFICATE-----"
+  ca_bundle_name           = "test-ca-bundle-${random_id.id.hex}"
+  ca_bundle_ca_bundle_pem  = "-----BEGIN CERTIFICATE-----\nMIICwjCCAaqgAwIBAgICEAAwDQYJKoZIhvcNAQELBQAwFzEVMBMGA1UEAwwMdGVz\ndC1yb290LWNhMB4XDTIwMDkxMTIyMjczMFoXDTIxMDkxMTIyMjczMFowHzEdMBsG\nA1UEAwwUdGVzdC1pbnRlcm1lZGlhdGUtY2EwggEiMA0GCSqGSIb3DQEBAQUAA4IB\nDwAwggEKAoIBAQDoGijYmLa6P+2C2hcXV7DNBuZ0K+1x41lC8emin9d6wsxsWYJn\nUzthLgJ28eol9CsDQlgRt+rGfYzKgfG7y7Wg7WYQXFHYZt1ANRB0OEVJYm7xurMA\nw6T68gBBctbLCcsk2WmWKp50Js7bwMKGGpCuDQ3YGWb1Bn1cu1qC9eWxl+VXV7RU\nMug1CtloLLrUlZt3FjbKBZEhhq4L6ukKTfNUzAofu4Q0ACxWht7ueuJMWaAaOUR2\nHu5KuGjkiJLvW/wRFeN55+rtuh9Bw/fKnhEq5/q9VCmw4g9sfNO0wIUqBhYx8etF\nYsGww1FWOEtGdUDv8NazYowPdpDwZzWA9UaPAgMBAAGjEDAOMAwGA1UdEwQFMAMB\nAf8wDQYJKoZIhvcNAQELBQADggEBAIrr04h+LmTM/JXEE/7kD8sB77YQhkbaWZPV\nuOwgdwVldAaGJkp4nyFPgcm+W7AXuoMMCq1ONNQuic2voopGU3EFng/tGODdYxiR\nedHyRPX23tJF19MSIJebJ7PNu2LtUU7tQspf4yqt4sBxW0nwjjSNyxPIZdnjNgFG\nHqpGgfIS9rSm89A6XRhwLSiudsQV/bfdHOgYUNuaPZn5LiyxHvHAorsZ1rpymNa6\nL78Mn4YLEBIT6XftA67z9g9N963FhGM0Il2iUVXm4HU/XqM26s94ZHlCIVJnV5xQ\nmjUvxEKNZMc7CRgz1Mr0Am898gQQZZrySHpDNvhpP50OeYH9/mU=\n-----END CERTIFICATE-----`, Update: `-----BEGIN CERTIFICATE-----\n\nMIICwTCCAamgAwIBAgIJAMz8Puud7CUcMA0GCSqGSIb3DQEBCwUAMBcxFTATBgNV\nBAMMDHRlc3Qtcm9vdC1jYTAeFw0yMDA5MTEyMjI3MzBaFw0zMDA5MDkyMjI3MzBa\nMBcxFTATBgNVBAMMDHRlc3Qtcm9vdC1jYTCCASIwDQYJKoZIhvcNAQEBBQADggEP\nADCCAQoCggEBALQql3DFigzMMlTXGJlz4ulZJx3kPmCySwl2rzZ+jZhMF8Oy/5xn\n99ToHgbj+Pp/7XWuogtwkfoZYmU1BTHyjZlaNccTLwkP/4SkjZ7cKsv4TTCN0q/4\nZF6dVoQOom/owREX4YEnISUgN4U5vpZkzkr3NOpiULAmimrROq52TcC2y52ijui9\nSf7QDmtVW7M4kUFjT+If/2yxX/g1dsbKxh+cuZimLWypD3TmhWehglgEZRiDnXJL\n7davAG0DOeO2scnglOY0JAOyM6po4WALmBf6OBxl2jiYpwWgkXMhgGf5u3ID6IDP\nJ2ZeYb9PZ2Z5jYGxUDLRVaaXr0a4a4UbvuECAwEAAaMQMA4wDAYDVR0TBAUwAwEB\n/zANBgkqhkiG9w0BAQsFAAOCAQEATqNEMvk7NUi6M9tv743CVGZa9JLdpdD9ZCbY\nvH6qEl5nVVAiUiKCRSnntDNtUkFd9tVQGk5Hgp2aMm1epq6kC3N0K4Dbsg1dWU4O\nYRG47CSv+sBI4VpDqRjtOS3+FlmMlm237ahs7YcwHNUqqGKbl9QZACxXZeCArYhZ\nt6xDqLb0gKON5gKlhnUqhYTT4+CcBan2nnr7sbdZhwtOmFgrowvs4OVh6WwdbI9m\nSdNKzy7AXAlcodkXAfjIoODeOQdEK6/Ine1K+W4sOk9e+oymoD0KnzhDLI3MDB3V\nGKIiVcct3DMHGI+y04/kcuasqUo4l6lrjt2wJF1pHbaxKIcyGQ==\n-----END CERTIFICATE-----"
 }

examples/service_mesh/virtual_deployment.tf

@@ -7,6 +7,9 @@ resource "oci_service_mesh_virtual_deployment" "test_virtual_deployment" {
     #Required
     port     = local.virtual_deployment_listeners_port
     protocol = local.virtual_deployment_listeners_protocol
+    #Optional
+    request_timeout_in_ms = local.virtual_deployment_listeners_request_timeout_in_ms
+    idle_timeout_in_ms    = local.virtual_deployment_listeners_idle_timeout_in_ms
   }
   name = local.virtual_deployment_name
   service_discovery {
@@ -30,13 +33,16 @@ data "oci_service_mesh_virtual_deployment" "test_virtual_deployment" {
 }
 
 locals {
-  virtual_deployment_name                       = "test-virtual-deployment"
-  virtual_deployment_description                = "test virtual deployment description"
-  virtual_deployment_listeners_port             = "8080"
-  virtual_deployment_listeners_protocol         = "HTTP"
+  virtual_deployment_name                            = "test-virtual-deployment"
+  virtual_deployment_description                     = "test virtual deployment description"
+  virtual_deployment_listeners_port                  = "8080"
+  virtual_deployment_listeners_request_timeout_in_ms = 100
+  virtual_deployment_listeners_idle_timeout_in_ms    = 500
+  virtual_deployment_listeners_protocol              = "HTTP"
   // allowed values for above for above are ("HTTP", "TLS_PASSTHROUGH", "TCP", "HTTP2", "GRPC")
+
   virtual_deployment_service_discovery_hostname = "test.com"
   virtual_deployment_service_discovery_type     = "DNS"
   // Allowed values for above are ("DNS", "DISABLED"). Default is "DISABLED"
   virtual_deployment_access_logging_is_enabled  = true
-}
+}