Skip to content

Commit 76d6e21

Browse files
abhilash-avabhilash-av
authored
Merge pull request #872 from terraform-providers/release_merge_v3.43.0
Candidate for release_v3.43.0
2 parents 7f2c873 + af97ae5 commit 76d6e21

File tree

173 files changed

+1783
-209
lines changed

Some content is hidden

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

173 files changed

+1783
-209
lines changed

‎CHANGELOG.md‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
## 3.41.1 (Unreleased)
1+
## 3.43.0 (Unreleased)
2+
3+
### Added
4+
- Support for Granular security lists in Autonomous Database - Dedicated
5+
- Support for regional subnet integration for Oracle Kubernetes Container engine
6+
- Support Kubernetes secret encryption for clusters using `kms_key_id`
7+
- Support for allowing user selected Autobackup start time window using `auto_backup_window`
8+
- Support for system tags in core instances, block storage, load balancer and autonomous transaction processing
9+
210
## 3.41.0 (September 04, 2019)
311

412
### Added

‎examples/container_engine/regional_subnet/cluster.tf‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
// Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
2+
3+
resource "oci_containerengine_cluster" "test_cluster" {
4+
#Required
5+
compartment_id = "${var.compartment_ocid}"
6+
kubernetes_version = "${data.oci_containerengine_cluster_option.test_cluster_option.kubernetes_versions.0}"
7+
name = "${var.cluster_name}"
8+
vcn_id = "${oci_core_vcn.test_vcn.id}"
9+
10+
#Optional
11+
options {
12+
service_lb_subnet_ids = ["${oci_core_subnet.clusterSubnet_1.id}", "${oci_core_subnet.clusterSubnet_2.id}"]
13+
14+
#Optional
15+
add_ons {
16+
#Optional
17+
is_kubernetes_dashboard_enabled = "${var.cluster_options_add_ons_is_kubernetes_dashboard_enabled}"
18+
is_tiller_enabled = "${var.cluster_options_add_ons_is_tiller_enabled}"
19+
}
20+
21+
kubernetes_network_config {
22+
#Optional
23+
pods_cidr = "${var.cluster_options_kubernetes_network_config_pods_cidr}"
24+
services_cidr = "${var.cluster_options_kubernetes_network_config_services_cidr}"
25+
}
26+
}
27+
}
28+
29+
resource "oci_containerengine_node_pool" "test_node_pool" {
30+
#Required
31+
cluster_id = "${oci_containerengine_cluster.test_cluster.id}"
32+
compartment_id = "${var.compartment_ocid}"
33+
kubernetes_version = "${data.oci_containerengine_node_pool_option.test_node_pool_option.kubernetes_versions.0}"
34+
name = "${var.node_pool_name}"
35+
node_image_name = "${var.node_pool_node_image_name}"
36+
node_shape = "${var.node_pool_node_shape}"
37+
38+
#Optional
39+
initial_node_labels {
40+
#Optional
41+
key = "${var.node_pool_initial_node_labels_key}"
42+
value = "${var.node_pool_initial_node_labels_value}"
43+
}
44+
45+
ssh_public_key = "${var.node_pool_ssh_public_key}"
46+
47+
node_config_details {
48+
placement_configs {
49+
availability_domain = "${data.oci_identity_availability_domain.ad1.name}"
50+
subnet_id = "${oci_core_subnet.node_pool_regional_subnet_1.id}"
51+
}
52+
53+
placement_configs {
54+
availability_domain = "${data.oci_identity_availability_domain.ad2.name}"
55+
subnet_id = "${oci_core_subnet.node_pool_regional_subnet_2.id}"
56+
}
57+
58+
size = 4
59+
}
60+
}
61+
62+
output "cluster" {
63+
value = {
64+
id = "${oci_containerengine_cluster.test_cluster.id}"
65+
kubernetes_version = "${oci_containerengine_cluster.test_cluster.kubernetes_version}"
66+
name = "${oci_containerengine_cluster.test_cluster.name}"
67+
}
68+
}
69+
70+
output "node_pool" {
71+
value = {
72+
id = "${oci_containerengine_node_pool.test_node_pool.id}"
73+
kubernetes_version = "${oci_containerengine_node_pool.test_node_pool.kubernetes_version}"
74+
name = "${oci_containerengine_node_pool.test_node_pool.name}"
75+
}
76+
}

‎examples/container_engine/regional_subnet/datasources.tf‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
// Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
2+
3+
data "oci_identity_availability_domain" "ad1" {
4+
compartment_id = "${var.tenancy_ocid}"
5+
ad_number = 1
6+
}
7+
8+
data "oci_identity_availability_domain" "ad2" {
9+
compartment_id = "${var.tenancy_ocid}"
10+
ad_number = 2
11+
}
12+
13+
data "oci_containerengine_cluster_option" "test_cluster_option" {
14+
cluster_option_id = "all"
15+
}
16+
17+
data "oci_containerengine_node_pool_option" "test_node_pool_option" {
18+
node_pool_option_id = "all"
19+
}
20+
21+
output "cluster_kubernetes_versions" {
22+
value = ["${data.oci_containerengine_cluster_option.test_cluster_option.kubernetes_versions}"]
23+
}
24+
25+
output "node_pool_kubernetes_version" {
26+
value = ["${data.oci_containerengine_node_pool_option.test_node_pool_option.kubernetes_versions}"]
27+
}

‎examples/container_engine/regional_subnet/kube_config.tf‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
// Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
2+
3+
variable "cluster_kube_config_expiration" {
4+
default = 2592000
5+
}
6+
7+
variable "cluster_kube_config_token_version" {
8+
default = "1.0.0"
9+
}
10+
11+
data "oci_containerengine_cluster_kube_config" "test_cluster_kube_config" {
12+
#Required
13+
cluster_id = "${oci_containerengine_cluster.test_cluster.id}"
14+
15+
#Optional
16+
expiration = "${var.cluster_kube_config_expiration}"
17+
token_version = "${var.cluster_kube_config_token_version}"
18+
}
19+
20+
resource "local_file" "test_cluster_kube_config_file" {
21+
content = "${data.oci_containerengine_cluster_kube_config.test_cluster_kube_config.content}"
22+
filename = "${path.module}/test_cluster_kubeconfig"
23+
}

‎examples/container_engine/regional_subnet/networking.tf‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
// Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
2+
3+
resource "oci_core_vcn" "test_vcn" {
4+
cidr_block = "10.0.0.0/16"
5+
compartment_id = "${var.compartment_ocid}"
6+
display_name = "tfVcnForClusters"
7+
}
8+
9+
resource "oci_core_internet_gateway" "test_ig" {
10+
compartment_id = "${var.compartment_ocid}"
11+
display_name = "tfClusterInternetGateway"
12+
vcn_id = "${oci_core_vcn.test_vcn.id}"
13+
}
14+
15+
resource "oci_core_route_table" "test_route_table" {
16+
compartment_id = "${var.compartment_ocid}"
17+
vcn_id = "${oci_core_vcn.test_vcn.id}"
18+
display_name = "tfClustersRouteTable"
19+
20+
route_rules {
21+
destination = "0.0.0.0/0"
22+
destination_type = "CIDR_BLOCK"
23+
network_entity_id = "${oci_core_internet_gateway.test_ig.id}"
24+
}
25+
}
26+
27+
resource "oci_core_subnet" "clusterSubnet_1" {
28+
#Required
29+
availability_domain = "${data.oci_identity_availability_domain.ad1.name}"
30+
cidr_block = "10.0.20.0/24"
31+
compartment_id = "${var.compartment_ocid}"
32+
vcn_id = "${oci_core_vcn.test_vcn.id}"
33+
34+
# Provider code tries to maintain compatibility with old versions.
35+
security_list_ids = ["${oci_core_vcn.test_vcn.default_security_list_id}"]
36+
display_name = "tfSubNet1ForClusters"
37+
route_table_id = "${oci_core_route_table.test_route_table.id}"
38+
}
39+
40+
resource "oci_core_subnet" "clusterSubnet_2" {
41+
#Required
42+
availability_domain = "${data.oci_identity_availability_domain.ad2.name}"
43+
cidr_block = "10.0.21.0/24"
44+
compartment_id = "${var.compartment_ocid}"
45+
vcn_id = "${oci_core_vcn.test_vcn.id}"
46+
display_name = "tfSubNet1ForClusters"
47+
48+
# Provider code tries to maintain compatibility with old versions.
49+
security_list_ids = ["${oci_core_vcn.test_vcn.default_security_list_id}"]
50+
route_table_id = "${oci_core_route_table.test_route_table.id}"
51+
}
52+
53+
resource "oci_core_subnet" "node_pool_regional_subnet_1" {
54+
#Required
55+
cidr_block = "10.0.24.0/24"
56+
compartment_id = "${var.compartment_ocid}"
57+
vcn_id = "${oci_core_vcn.test_vcn.id}"
58+
59+
# Provider code tries to maintain compatibility with old versions.
60+
security_list_ids = ["${oci_core_vcn.test_vcn.default_security_list_id}"]
61+
display_name = "regionalSubnet1"
62+
route_table_id = "${oci_core_route_table.test_route_table.id}"
63+
}
64+
65+
resource "oci_core_subnet" "node_pool_regional_subnet_2" {
66+
#Required
67+
cidr_block = "10.0.25.0/24"
68+
compartment_id = "${var.compartment_ocid}"
69+
vcn_id = "${oci_core_vcn.test_vcn.id}"
70+
71+
# Provider code tries to maintain compatibility with old versions.
72+
security_list_ids = ["${oci_core_vcn.test_vcn.default_security_list_id}"]
73+
display_name = "regionalSubnet2"
74+
route_table_id = "${oci_core_route_table.test_route_table.id}"
75+
}

‎examples/container_engine/regional_subnet/provider.tf‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
2+
3+
/*
4+
* This example file shows how to configure the oci provider to target a single region.
5+
*/
6+
7+
// These variables would commonly be defined as environment variables or sourced in a .env file
8+
variable "tenancy_ocid" {}
9+
10+
variable "user_ocid" {}
11+
variable "fingerprint" {}
12+
variable "private_key_path" {}
13+
variable "compartment_ocid" {}
14+
15+
variable "region" {
16+
default = "us-ashburn-1"
17+
}
18+
19+
provider "oci" {
20+
region = "${var.region}"
21+
tenancy_ocid = "${var.tenancy_ocid}"
22+
user_ocid = "${var.user_ocid}"
23+
fingerprint = "${var.fingerprint}"
24+
private_key_path = "${var.private_key_path}"
25+
}

‎examples/container_engine/regional_subnet/variables.tf‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
// Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
2+
3+
variable "cluster_name" {
4+
default = "tfTestCluster"
5+
}
6+
7+
variable "availability_domain" {
8+
default = 3
9+
}
10+
11+
variable "cluster_options_add_ons_is_kubernetes_dashboard_enabled" {
12+
default = true
13+
}
14+
15+
variable "cluster_options_add_ons_is_tiller_enabled" {
16+
default = true
17+
}
18+
19+
variable "cluster_options_kubernetes_network_config_pods_cidr" {
20+
default = "10.1.0.0/16"
21+
}
22+
23+
variable "cluster_options_kubernetes_network_config_services_cidr" {
24+
default = "10.2.0.0/16"
25+
}
26+
27+
variable "node_pool_initial_node_labels_key" {
28+
default = "key"
29+
}
30+
31+
variable "node_pool_initial_node_labels_value" {
32+
default = "value"
33+
}
34+
35+
variable "node_pool_name" {
36+
default = "tfPool"
37+
}
38+
39+
variable "node_pool_node_image_name" {
40+
default = "Oracle-Linux-7.4"
41+
}
42+
43+
variable "node_pool_node_shape" {
44+
default = "VM.Standard2.1"
45+
}
46+
47+
variable "node_pool_quantity_per_subnet" {
48+
default = 2
49+
}
50+
51+
variable "node_pool_ssh_public_key" {
52+
default = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDOuBJgh6lTmQvQJ4BA3RCJdSmxRtmiXAQEEIP68/G4gF3XuZdKEYTFeputacmRq9yO5ZnNXgO9akdUgePpf8+CfFtveQxmN5xo3HVCDKxu/70lbMgeu7+wJzrMOlzj+a4zNq2j0Ww2VWMsisJ6eV3bJTnO/9VLGCOC8M9noaOlcKcLgIYy4aDM724MxFX2lgn7o6rVADHRxkvLEXPVqYT4syvYw+8OVSnNgE4MJLxaw8/2K0qp19YlQyiriIXfQpci3ThxwLjymYRPj+kjU1xIxv6qbFQzHR7ds0pSWp1U06cIoKPfCazU9hGWW8yIe/vzfTbWrt2DK6pLwBn/G0x3 sample"
53+
}

‎examples/database/atp-d/exadata.tf‎

Lines changed: 27 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
22

3-
resource "oci_core_vcn" "t" {
3+
resource "oci_core_vcn" "test_vcn" {
44
compartment_id = "${var.compartment_ocid}"
55
cidr_block = "10.1.0.0/16"
6-
display_name = "-tf-vcn"
7-
dns_label = "tfvcn"
6+
display_name = "TestVcn"
7+
dns_label = "examplevcn"
88
}
99

1010
data "oci_identity_availability_domain" "ad" {
@@ -14,7 +14,7 @@ data "oci_identity_availability_domain" "ad" {
1414

1515
resource "oci_core_security_list" "exadata_shapes_security_list" {
1616
compartment_id = "${var.compartment_ocid}"
17-
vcn_id = "${oci_core_vcn.t.id}"
17+
vcn_id = "${oci_core_vcn.test_vcn.id}"
1818
display_name = "ExadataSecurityList"
1919

2020
ingress_security_rules {
@@ -41,50 +41,61 @@ resource "oci_core_security_list" "exadata_shapes_security_list" {
4141
resource "oci_core_subnet" "exadata_subnet" {
4242
availability_domain = "${data.oci_identity_availability_domain.ad.name}"
4343
cidr_block = "10.1.22.0/24"
44-
display_name = "ExadataSubnet"
44+
display_name = "TestExadataSubnet"
4545
compartment_id = "${var.compartment_ocid}"
46-
vcn_id = "${oci_core_vcn.t.id}"
47-
route_table_id = "${oci_core_vcn.t.default_route_table_id}"
48-
dhcp_options_id = "${oci_core_vcn.t.default_dhcp_options_id}"
49-
security_list_ids = ["${oci_core_vcn.t.default_security_list_id}", "${oci_core_security_list.exadata_shapes_security_list.id}"]
46+
vcn_id = "${oci_core_vcn.test_vcn.id}"
47+
route_table_id = "${oci_core_vcn.test_vcn.default_route_table_id}"
48+
dhcp_options_id = "${oci_core_vcn.test_vcn.default_dhcp_options_id}"
49+
security_list_ids = ["${oci_core_vcn.test_vcn.default_security_list_id}", "${oci_core_security_list.exadata_shapes_security_list.id}"]
5050
dns_label = "subnetexadata"
5151
}
5252

5353
resource "oci_database_autonomous_exadata_infrastructure" "test_autonomous_exadata_infrastructure" {
5454
availability_domain = "${data.oci_identity_availability_domain.ad.name}"
5555
compartment_id = "${var.compartment_ocid}"
56-
display_name = "exadata-display-name"
56+
display_name = "TestExadata11"
5757
domain = "${var.autonomous_exadata_infrastructure_domain}"
5858
freeform_tags = "${var.autonomous_database_freeform_tags}"
5959
license_model = "LICENSE_INCLUDED"
6060

6161
maintenance_window_details {
6262
preference = "CUSTOM_PREFERENCE"
6363

64-
days_of_week = {
64+
days_of_week {
6565
name = "MONDAY"
6666
}
6767

6868
hours_of_day = ["4"]
6969

70-
months = {
70+
months {
7171
name = "APRIL"
7272
}
7373

7474
weeks_of_month = ["2"]
7575
}
7676

77-
shape = "${var.autonomous_exadata_infrastructure_shape}"
77+
nsg_ids = ["${oci_core_network_security_group.test_network_security_group.id}"]
78+
shape = "Exadata.Quarter2.92"
7879
subnet_id = "${oci_core_subnet.exadata_subnet.id}"
7980
}
8081

82+
resource "oci_core_network_security_group" "test_network_security_group" {
83+
#Required
84+
compartment_id = "${var.compartment_ocid}"
85+
vcn_id = "${oci_core_vcn.test_vcn.id}"
86+
}
87+
8188
data "oci_database_autonomous_exadata_infrastructures" "test_autonomous_exadata_infrastructures" {
8289
availability_domain = "${data.oci_identity_availability_domain.ad.name}"
8390
compartment_id = "${var.compartment_ocid}"
84-
display_name = "exadata-display-name"
91+
display_name = "TestExadata"
8592
state = "AVAILABLE"
8693
}
8794

88-
output "test_autonomous_exadata_infrastructure" {
89-
value = "${data.oci_database_autonomous_exadata_infrastructures.test_autonomous_exadata_infrastructures.autonomous_exadata_infrastructures}"
95+
data "oci_database_autonomous_exadata_infrastructure" "test_autonomous_exadata_infrastructure" {
96+
autonomous_exadata_infrastructure_id = "${oci_database_autonomous_exadata_infrastructure.test_autonomous_exadata_infrastructure.id}"
97+
}
98+
99+
output "test_autonomous_exadata_infrastructures" {
100+
value = ["${data.oci_database_autonomous_exadata_infrastructures.test_autonomous_exadata_infrastructures.autonomous_exadata_infrastructures}"]
90101
}

0 commit comments

Comments
 (0)