Skip to content

Commit 758a151

Browse files
sagarp337sagarp337
authored
Merge pull request #2295 from oracle/release_gh
Releasing version 6.26.0
2 parents 78e1baf + ce82fda commit 758a151

File tree

673 files changed

+43902
-799
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

673 files changed

+43902
-799
lines changed

‎CHANGELOG.md‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
## 6.26.0 (February 12, 2025)
2+
3+
### Added
4+
- Support for Organizations
5+
- Support for IPV6 for BaseDB
6+
- Support for Backup/Recovery Enhancements Phase 2 | ADB-D C@C
7+
- Support for Stack Monitoring: Support for Monitoring Templates
8+
- Support for Connections R6
9+
- Support for File Storage: Onboard to System Tags.
10+
- Support for IPv6 on OKE
11+
- Support for secret generation in SiV
12+
### Bug Fix
13+
- Fix update call for password change and apply config type while moving from fixed to flex database
14+
to use the correct Id for updating options config resource
15+
116
## 6.25.0 (February 05, 2025)
217

318
### Added

‎examples/README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,8 @@ This directory contains Terraform configuration files showing how to create spec
235235
[![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/storage.zip)
236236
- streaming
237237
[![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/streaming.zip)
238+
- tenantmanagercontrolplane
239+
[![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/tenantmanagercontrolplane.zip)
238240
- usage_proxy
239241
[![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/usage_proxy.zip)
240242
- vault_secret

‎examples/container_engine/ipv6/main.tf‎

Lines changed: 150 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,150 @@
1+
// Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
2+
// Licensed under the Mozilla Public License v2.0
3+
4+
variable "tenancy_ocid" {}
5+
variable "region" {
6+
default = "us-ashburn-1"
7+
}
8+
variable "compartment_ocid" {}
9+
10+
provider "oci" {
11+
tenancy_ocid = var.tenancy_ocid
12+
auth = "SecurityToken"
13+
config_file_profile = "terraform-federation-test"
14+
region = var.region
15+
}
16+
17+
data "oci_identity_availability_domain" "ad1" {
18+
compartment_id = var.tenancy_ocid
19+
ad_number = 1
20+
}
21+
22+
data "oci_identity_availability_domain" "ad2" {
23+
compartment_id = var.tenancy_ocid
24+
ad_number = 2
25+
}
26+
27+
data "oci_containerengine_cluster_option" "test_cluster_option" {
28+
cluster_option_id = "all"
29+
}
30+
31+
resource "oci_core_vcn" "test_vcn" {
32+
cidr_block = "10.0.0.0/16"
33+
compartment_id = var.compartment_ocid
34+
display_name = "tfDualStackVcnForClusters"
35+
is_ipv6enabled = true
36+
is_oracle_gua_allocation_enabled = true
37+
}
38+
39+
40+
resource "oci_core_internet_gateway" "test_ig" {
41+
compartment_id = var.compartment_ocid
42+
display_name = "tfClusterInternetGateway"
43+
vcn_id = oci_core_vcn.test_vcn.id
44+
}
45+
resource "oci_core_route_table" "test_route_table" {
46+
compartment_id = var.compartment_ocid
47+
vcn_id = oci_core_vcn.test_vcn.id
48+
display_name = "tfClustersRouteTable"
49+
route_rules {
50+
destination = "0.0.0.0/0"
51+
destination_type = "CIDR_BLOCK"
52+
network_entity_id = oci_core_internet_gateway.test_ig.id
53+
}
54+
}
55+
resource "oci_core_subnet" "test_subnet" {
56+
#Required
57+
cidr_block = "10.0.20.0/24"
58+
compartment_id = var.compartment_ocid
59+
vcn_id = oci_core_vcn.test_vcn.id
60+
# Provider code tries to maintain compatibility with old versions.
61+
security_list_ids = [oci_core_vcn.test_vcn.default_security_list_id]
62+
display_name = "tfSubNet1ForNodePool"
63+
route_table_id = oci_core_route_table.test_route_table.id
64+
ipv6cidr_block = cidrsubnet(oci_core_vcn.test_vcn.ipv6cidr_blocks[0], 8, 1) # Creating a /64 subnet from /56
65+
}
66+
resource "oci_core_security_list" "test_security_list" {
67+
compartment_id = var.compartment_ocid
68+
vcn_id = oci_core_vcn.test_vcn.id
69+
display_name = "Default Security List for virtual node pool"
70+
egress_security_rules {
71+
destination = "0.0.0.0/0"
72+
destination_type = "CIDR_BLOCK"
73+
protocol = "all"
74+
stateless = false
75+
description = "Allowing egress to all via all protocols."
76+
}
77+
ingress_security_rules {
78+
source = "10.0.0.0/16"
79+
source_type = "CIDR_BLOCK"
80+
protocol = "all"
81+
stateless = false
82+
}
83+
ingress_security_rules {
84+
protocol = 6 # local.TCP
85+
source = "0.0.0.0/0"
86+
source_type = "CIDR_BLOCK"
87+
stateless = false
88+
description = "Allowing ingress to all via TCP"
89+
# Optional
90+
tcp_options {
91+
max = "6443"
92+
min = "6443"
93+
source_port_range {
94+
max = "1521"
95+
min = "1521"
96+
}
97+
}
98+
}
99+
ingress_security_rules {
100+
# Optional
101+
icmp_options {
102+
code = "4"
103+
type = "3"
104+
}
105+
protocol = 1 # local.ICMP
106+
source = "0.0.0.0/0"
107+
source_type = "CIDR_BLOCK"
108+
stateless = false
109+
description = "Allowing ingress to all via ICMP"
110+
}
111+
ingress_security_rules {
112+
# Optional
113+
icmp_options {
114+
code = "-1"
115+
type = "3"
116+
}
117+
protocol = 1 # local.ICMP
118+
source = "10.0.0.0/16"
119+
source_type = "CIDR_BLOCK"
120+
stateless = false
121+
}
122+
}
123+
124+
# Create a dual stack cluster
125+
resource "oci_containerengine_cluster" "test_cluster" {
126+
#Required
127+
compartment_id = var.compartment_ocid
128+
kubernetes_version = reverse(data.oci_containerengine_cluster_option.test_cluster_option.kubernetes_versions)[0]
129+
name = "tfTestClusterDualStack"
130+
vcn_id = oci_core_vcn.test_vcn.id
131+
type = "ENHANCED_CLUSTER"
132+
cluster_pod_network_options {
133+
# VNPs require cni_type as OCI_VCN_IP_NATIVE
134+
cni_type = "OCI_VCN_IP_NATIVE"
135+
}
136+
options {
137+
ip_families = ["IPv4", "IPv6"]
138+
}
139+
endpoint_config {
140+
#Optional
141+
is_public_ip_enabled = true
142+
nsg_ids = ["${oci_core_network_security_group.network_security_group_rd.id}"]
143+
subnet_id = oci_core_subnet.test_subnet.id
144+
}
145+
}
146+
resource "oci_core_network_security_group" "network_security_group_rd" {
147+
compartment_id = var.compartment_ocid
148+
vcn_id = oci_core_vcn.test_vcn.id
149+
display_name = "displayName"
150+
}

‎examples/database/dataguard/vm_shape/dataguard.tf‎

Lines changed: 201 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
// Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
2+
3+
variable "tenancy_ocid" {
4+
}
5+
6+
variable "user_ocid" {
7+
}
8+
9+
variable "fingerprint" {
10+
}
11+
12+
variable "private_key_path" {
13+
}
14+
15+
variable "compartment_ocid" {
16+
}
17+
18+
variable "region" {
19+
}
20+
21+
variable "ssh_public_key" {
22+
}
23+
24+
provider "oci" {
25+
tenancy_ocid = var.tenancy_ocid
26+
user_ocid = var.user_ocid
27+
fingerprint = var.fingerprint
28+
private_key_path = var.private_key_path
29+
region = var.region
30+
}
31+
32+
data "oci_identity_availability_domain" "ad" {
33+
compartment_id = var.tenancy_ocid
34+
ad_number = 1
35+
}
36+
37+
data "oci_core_services" "test_services" {
38+
filter {
39+
name = "name"
40+
values = [".*Oracle.*Services.*Network"]
41+
regex = true
42+
}
43+
}
44+
45+
data "oci_identity_availability_domains" "test_availability_domains" {
46+
compartment_id = var.tenancy_ocid
47+
}
48+
49+
resource "oci_core_vcn" "test_vcn" {
50+
cidr_block = "10.0.0.0/16"
51+
compartment_id = var.compartment_ocid
52+
display_name = "TFExampleVCN"
53+
dns_label = "tfexamplevcn"
54+
ipv6private_cidr_blocks = ["fc00:1000::/52"]
55+
is_ipv6enabled = true
56+
}
57+
58+
resource "oci_core_service_gateway" "test_service_gateway" {
59+
compartment_id = var.compartment_ocid
60+
display_name = "test_service_gateway"
61+
vcn_id = oci_core_vcn.test_vcn.id
62+
63+
services {
64+
service_id = data.oci_core_services.test_services.services.0.id
65+
}
66+
67+
}
68+
69+
resource "oci_core_default_route_table" "test_vcn__default_route_table" {
70+
manage_default_resource_id = oci_core_vcn.test_vcn.default_route_table_id
71+
72+
route_rules {
73+
network_entity_id = oci_core_service_gateway.test_service_gateway.id
74+
75+
description = "Internal traffic for OCI Services"
76+
destination = data.oci_core_services.test_services.services[0].cidr_block
77+
destination_type = "SERVICE_CIDR_BLOCK"
78+
}
79+
}
80+
81+
resource "oci_core_route_table" "test_route_table" {
82+
compartment_id = var.compartment_ocid
83+
display_name = "test_subnet_rt"
84+
vcn_id = oci_core_vcn.test_vcn.id
85+
86+
route_rules {
87+
network_entity_id = oci_core_service_gateway.test_service_gateway.id
88+
89+
description = "Internal traffic for OCI Services"
90+
destination = data.oci_core_services.test_services.services[0].cidr_block
91+
destination_type = "SERVICE_CIDR_BLOCK"
92+
}
93+
}
94+
95+
resource "oci_core_security_list" "test_security_list" {
96+
compartment_id = var.compartment_ocid
97+
vcn_id = oci_core_vcn.test_vcn.id
98+
display_name = "test_security_list"
99+
100+
// allow outbound tcp traffic on all ports
101+
egress_security_rules {
102+
destination = "0.0.0.0/0"
103+
protocol = "6"
104+
}
105+
106+
ingress_security_rules {
107+
protocol = "6"
108+
source = "0.0.0.0/0"
109+
}
110+
}
111+
112+
resource "oci_core_subnet" "test_subnet" {
113+
cidr_block = "10.0.2.0/24"
114+
compartment_id = var.compartment_ocid
115+
vcn_id = oci_core_vcn.test_vcn.id
116+
display_name = "test_subnet"
117+
security_list_ids = [oci_core_security_list.test_security_list.id]
118+
route_table_id = oci_core_route_table.test_route_table.id
119+
dhcp_options_id = oci_core_vcn.test_vcn.default_dhcp_options_id
120+
dns_label = "tftestsubnet"
121+
prohibit_public_ip_on_vnic = "true"
122+
ipv6cidr_blocks = ["${substr(oci_core_vcn.test_vcn.ipv6cidr_blocks[0], 0, length(oci_core_vcn.test_vcn.ipv6cidr_blocks[0]) - 2)}${64}"]
123+
}
124+
125+
126+
resource "oci_database_db_system" "test_db_system" {
127+
availability_domain = data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name
128+
compartment_id = var.compartment_ocid
129+
subnet_id = oci_core_subnet.test_subnet.id
130+
database_edition = "ENTERPRISE_EDITION"
131+
disk_redundancy = "NORMAL"
132+
shape = "VM.Standard2.1"
133+
ssh_public_keys = [var.ssh_public_key]
134+
domain = oci_core_subnet.test_subnet.subnet_domain_name
135+
hostname = "myOracleDB"
136+
data_storage_size_in_gb = "256"
137+
license_model = "LICENSE_INCLUDED"
138+
node_count = "1"
139+
display_name = "TFExampleDbSystem"
140+
141+
db_home {
142+
db_version = "12.1.0.2"
143+
display_name = "TFExampleDbHome"
144+
145+
database {
146+
admin_password = "BEstrO0ng_#11"
147+
db_name = "db1"
148+
}
149+
}
150+
}
151+
152+
data "oci_database_db_homes" "t" {
153+
compartment_id = var.compartment_ocid
154+
db_system_id = oci_database_db_system.test_db_system.id
155+
156+
filter {
157+
name = "display_name"
158+
values = ["TFExampleDbHome"]
159+
}
160+
}
161+
162+
data "oci_database_databases" "db" {
163+
compartment_id = var.compartment_ocid
164+
db_home_id = data.oci_database_db_homes.t.db_homes[0].db_home_id
165+
}
166+
167+
resource "oci_database_data_guard_association" "test_data_guard_association" {
168+
#Required
169+
creation_type = "NewDbSystem"
170+
database_admin_password = "BEstrO0ng_#11"
171+
database_id = data.oci_database_databases.db.databases[0].id
172+
protection_mode = "MAXIMUM_PERFORMANCE"
173+
transport_type = "ASYNC"
174+
delete_standby_db_home_on_delete = "true"
175+
176+
#required for NewDbSystem creation_type
177+
display_name = "TFExampleDataGuardAssociationVM"
178+
shape = "VM.Standard2.1"
179+
subnet_id = oci_core_subnet.test_subnet.id
180+
availability_domain = data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name
181+
nsg_ids = [oci_core_network_security_group.test_network_security_group.id]
182+
hostname = "ocidb"
183+
db_system_defined_tags = map("example-tag-namespace-all.example-tag", "dbSystemDefinedTags1")
184+
db_system_freeform_tags = {"dbSystemFreeformTagsK" = "dbSystemFreeformTagsV"}
185+
database_defined_tags = map("example-tag-namespace-all.example-tag", "databaseDefinedTags1")
186+
database_freeform_tags = {"databaseFreeformTagsK" = "databaseFreeformTagsV"}
187+
fault_domains = ["FAULT-DOMAIN-3"]
188+
license_model = "LICENSE_INCLUDED"
189+
node_count = "1"
190+
private_ip = "10.0.2.223"
191+
private_ip_v6 = "${substr(oci_core_vcn.test_vcn.ipv6cidr_blocks[0], 0, length(oci_core_vcn.test_vcn.ipv6cidr_blocks[0]) - 4)}5901:cede:a617:8bba"
192+
time_zone = "US/Pacific"
193+
is_active_data_guard_enabled = "false"
194+
}
195+
196+
resource "oci_core_network_security_group" "test_network_security_group" {
197+
compartment_id = var.compartment_ocid
198+
vcn_id = oci_core_vcn.test_vcn.id
199+
display_name = "tf-example-nsg"
200+
}
201+

0 commit comments

Comments
 (0)