Skip to content

Commit

Permalink
Merge pull request #2235 from oracle/release_gh
Browse files Browse the repository at this point in the history
Release gh v6.16.0
  • Loading branch information
ravinitp authored Oct 30, 2024
2 parents dd2e646 + e63216d commit 77156f7
Show file tree
Hide file tree
Showing 236 changed files with 1,167 additions and 2,908 deletions.
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
## 6.16.0 (October 30, 2024)

### Added
- Support for ESP & ICMP traffic support in NLB
- override_existing flag for container_engine.addon resource
- Support for Extending LBaaS to send traffic to gRPC backends
- Support to return the generated secret in response
- Support for Model Version Set - DataScience BugFix
- pdated resource scheduler public documentation
### Bug Fix
- Updated oci_core_instance_pool resource to allow unordered attach/detach operationsupdating tests to generate reports for Acceptance and Backward compatibility
- Fix Audit and SQL Firewall bugs - DataSafe

## 6.15.0 (October 23, 2024)

### Added
Expand Down
9 changes: 0 additions & 9 deletions examples/compute/instance_pool/instance_pool.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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]
}
Expand All @@ -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]
}

4 changes: 2 additions & 2 deletions examples/compute/instance_pool/instance_pool_ipv6.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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 {
Expand Down
80 changes: 19 additions & 61 deletions examples/container_engine/addons/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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" {
Expand All @@ -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" {
Expand All @@ -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

Expand All @@ -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"
Expand Down
6 changes: 4 additions & 2 deletions examples/globally_distributed_database/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# Overview
This is a Terraform configuration that creates the Globally Distributed Database service on Oracle Cloud Infrastructure.
# Overview
This is a Terraform configuration that creates the `globally_distributed_database` service on Oracle Cloud Infrastructure.

The Terraform code is used to create a Resource Manager stack, that creates the required resources and configures the application on the created resources.
## Magic Button
[![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle/terraform-provider-oci/raw/master/examples/zips/globally_distributed_database.zip)
4 changes: 4 additions & 0 deletions examples/globally_distributed_database/description.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Overview
This is a Terraform configuration that creates the `globally_distributed_database` service on Oracle Cloud Infrastructure.

The Terraform code is used to create a Resource Manager stack, that creates the required resources and configures the application on the created resources.
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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" {
Expand All @@ -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
Expand All @@ -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" {
Expand Down
60 changes: 32 additions & 28 deletions examples/resourcescheduler/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down Expand Up @@ -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
Expand All @@ -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
}
Expand Down
Binary file modified examples/zips/adm.zip
Binary file not shown.
Binary file modified examples/zips/aiAnomalyDetection.zip
Binary file not shown.
Binary file modified examples/zips/aiDocument.zip
Binary file not shown.
Binary file modified examples/zips/aiLanguage.zip
Binary file not shown.
Binary file modified examples/zips/aiVision.zip
Binary file not shown.
Binary file modified examples/zips/always_free.zip
Binary file not shown.
Binary file modified examples/zips/analytics.zip
Binary file not shown.
Binary file modified examples/zips/announcements_service.zip
Binary file not shown.
Binary file modified examples/zips/api_gateway.zip
Binary file not shown.
Binary file modified examples/zips/apm.zip
Binary file not shown.
Binary file modified examples/zips/appmgmt_control.zip
Binary file not shown.
Binary file modified examples/zips/artifacts.zip
Binary file not shown.
Binary file modified examples/zips/audit.zip
Binary file not shown.
Binary file modified examples/zips/autoscaling.zip
Binary file not shown.
Binary file modified examples/zips/bastion.zip
Binary file not shown.
Binary file modified examples/zips/big_data_service.zip
Binary file not shown.
Binary file modified examples/zips/blockchain.zip
Binary file not shown.
Binary file modified examples/zips/budget.zip
Binary file not shown.
Binary file modified examples/zips/capacity_management.zip
Binary file not shown.
Binary file modified examples/zips/certificatesManagement.zip
Binary file not shown.
Binary file modified examples/zips/cloudBridge.zip
Binary file not shown.
Binary file modified examples/zips/cloudMigrations.zip
Binary file not shown.
Binary file modified examples/zips/cloudguard.zip
Binary file not shown.
Binary file modified examples/zips/cluster_placement_groups.zip
Binary file not shown.
Binary file modified examples/zips/compute.zip
Binary file not shown.
Binary file modified examples/zips/computecloudatcustomer.zip
Binary file not shown.
Binary file modified examples/zips/computeinstanceagent.zip
Binary file not shown.
Binary file modified examples/zips/concepts.zip
Binary file not shown.
Binary file modified examples/zips/container_engine.zip
Binary file not shown.
Binary file modified examples/zips/container_instances.zip
Binary file not shown.
Binary file modified examples/zips/database.zip
Binary file not shown.
Binary file modified examples/zips/databaseTools.zip
Binary file not shown.
Binary file modified examples/zips/databasemanagement.zip
Binary file not shown.
Binary file modified examples/zips/databasemigration.zip
Binary file not shown.
Binary file modified examples/zips/datacatalog.zip
Binary file not shown.
Binary file modified examples/zips/dataflow.zip
Binary file not shown.
Binary file modified examples/zips/dataintegration.zip
Binary file not shown.
Binary file modified examples/zips/datalabeling.zip
Binary file not shown.
Binary file modified examples/zips/datasafe.zip
Binary file not shown.
Binary file modified examples/zips/datascience.zip
Binary file not shown.
Binary file modified examples/zips/delegation_management.zip
Binary file not shown.
Binary file modified examples/zips/demand_signal.zip
Binary file not shown.
Binary file modified examples/zips/desktops.zip
Binary file not shown.
Binary file modified examples/zips/devops.zip
Binary file not shown.
Binary file modified examples/zips/disaster_recovery.zip
Binary file not shown.
Binary file modified examples/zips/dns.zip
Binary file not shown.
Binary file modified examples/zips/em_warehouse.zip
Binary file not shown.
Binary file modified examples/zips/email.zip
Binary file not shown.
Binary file modified examples/zips/events.zip
Binary file not shown.
Binary file modified examples/zips/fast_connect.zip
Binary file not shown.
Binary file modified examples/zips/fleet_apps_management.zip
Binary file not shown.
Binary file modified examples/zips/fleetsoftwareupdate.zip
Binary file not shown.
Binary file modified examples/zips/functions.zip
Binary file not shown.
Binary file modified examples/zips/fusionapps.zip
Binary file not shown.
Binary file modified examples/zips/generative_ai.zip
Binary file not shown.
Binary file modified examples/zips/globally_distributed_database.zip
Binary file not shown.
Binary file modified examples/zips/goldengate.zip
Binary file not shown.
Binary file modified examples/zips/health_checks.zip
Binary file not shown.
Binary file modified examples/zips/id6.zip
Binary file not shown.
Binary file modified examples/zips/identity.zip
Binary file not shown.
Binary file modified examples/zips/identity_data_plane.zip
Binary file not shown.
Binary file modified examples/zips/identity_domains.zip
Binary file not shown.
Binary file modified examples/zips/integration.zip
Binary file not shown.
Binary file modified examples/zips/jms.zip
Binary file not shown.
Binary file modified examples/zips/jms_java_downloads.zip
Binary file not shown.
Binary file modified examples/zips/kms.zip
Binary file not shown.
Binary file modified examples/zips/license_manager.zip
Binary file not shown.
Binary file modified examples/zips/limits.zip
Binary file not shown.
Binary file modified examples/zips/load_balancer.zip
Binary file not shown.
Binary file modified examples/zips/log_analytics.zip
Binary file not shown.
Binary file modified examples/zips/logging.zip
Binary file not shown.
Binary file modified examples/zips/management_agent.zip
Binary file not shown.
Binary file modified examples/zips/management_dashboard.zip
Binary file not shown.
Binary file modified examples/zips/marketplace.zip
Binary file not shown.
Binary file modified examples/zips/media_services.zip
Binary file not shown.
Binary file modified examples/zips/metering_computation.zip
Binary file not shown.
Binary file modified examples/zips/monitoring.zip
Binary file not shown.
Binary file modified examples/zips/mysql.zip
Binary file not shown.
Binary file modified examples/zips/network_firewall.zip
Binary file not shown.
Binary file modified examples/zips/network_load_balancer.zip
Binary file not shown.
Binary file modified examples/zips/networking.zip
Binary file not shown.
Binary file modified examples/zips/nosql.zip
Binary file not shown.
Binary file modified examples/zips/notifications.zip
Binary file not shown.
Binary file modified examples/zips/object_storage.zip
Binary file not shown.
Binary file modified examples/zips/ocvp.zip
Binary file not shown.
Binary file modified examples/zips/onesubscription.zip
Binary file not shown.
Binary file modified examples/zips/opa.zip
Binary file not shown.
Binary file modified examples/zips/opensearch.zip
Binary file not shown.
Binary file modified examples/zips/operator_access_control.zip
Binary file not shown.
Binary file modified examples/zips/opsi.zip
Binary file not shown.
Binary file modified examples/zips/optimizer.zip
Binary file not shown.
Binary file modified examples/zips/oracle_cloud_vmware_solution.zip
Binary file not shown.
Binary file modified examples/zips/oracle_content_experience.zip
Binary file not shown.
Binary file modified examples/zips/oracle_digital_assistant.zip
Binary file not shown.
Binary file modified examples/zips/os_management_hub.zip
Binary file not shown.
Binary file modified examples/zips/osmanagement.zip
Binary file not shown.
Binary file modified examples/zips/osp_gateway.zip
Binary file not shown.
Binary file modified examples/zips/osub_billing_schedule.zip
Binary file not shown.
Binary file modified examples/zips/osub_organization_subscription.zip
Binary file not shown.
Binary file modified examples/zips/osub_subscription.zip
Binary file not shown.
Binary file modified examples/zips/osub_usage.zip
Binary file not shown.
Binary file modified examples/zips/pic.zip
Binary file not shown.
Binary file modified examples/zips/psql.zip
Binary file not shown.
Binary file modified examples/zips/queue.zip
Binary file not shown.
Binary file modified examples/zips/recovery.zip
Binary file not shown.
Binary file modified examples/zips/redis.zip
Binary file not shown.
Binary file modified examples/zips/resourcemanager.zip
Binary file not shown.
Binary file modified examples/zips/resourcescheduler.zip
Binary file not shown.
Binary file modified examples/zips/security_attribute.zip
Binary file not shown.
Binary file modified examples/zips/serviceManagerProxy.zip
Binary file not shown.
Binary file modified examples/zips/service_catalog.zip
Binary file not shown.
Binary file modified examples/zips/service_connector_hub.zip
Binary file not shown.
Binary file modified examples/zips/service_mesh.zip
Binary file not shown.
Binary file modified examples/zips/stack_monitoring.zip
Binary file not shown.
Binary file modified examples/zips/storage.zip
Binary file not shown.
Binary file modified examples/zips/streaming.zip
Binary file not shown.
Binary file modified examples/zips/usage_proxy.zip
Binary file not shown.
Binary file modified examples/zips/vault_secret.zip
Binary file not shown.
Binary file modified examples/zips/vbs_inst.zip
Binary file not shown.
Binary file modified examples/zips/visual_builder.zip
Binary file not shown.
Binary file modified examples/zips/vn_monitoring.zip
Binary file not shown.
Binary file modified examples/zips/vulnerability_scanning_service.zip
Binary file not shown.
Binary file modified examples/zips/web_app_acceleration.zip
Binary file not shown.
Binary file modified examples/zips/web_app_firewall.zip
Binary file not shown.
Binary file modified examples/zips/web_application_acceleration_and_security.zip
Binary file not shown.
Binary file modified examples/zips/zpr.zip
Binary file not shown.
4 changes: 2 additions & 2 deletions internal/globalvar/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"log"
)

const Version = "6.15.0"
const Version = "6.16.0"

const ReleaseDate = "2024-10-28"
const ReleaseDate = "2024-10-30"

func PrintVersion() {
log.Printf("[INFO] terraform-provider-oci %s\n", Version)
Expand Down
Loading

0 comments on commit 77156f7

Please sign in to comment.