Skip to content

Commit b8b11f2

Browse files
srishtipmishrasrishtipmishra
authored
Merge pull request #1008 from terraform-providers/release_merge_v17.2.0
Release merge v17.2.0
2 parents 3786af0 + 5fbed57 commit b8b11f2

File tree

756 files changed

+18965
-1968
lines changed

Some content is hidden

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

756 files changed

+18965
-1968
lines changed

‎CHANGELOG.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
11
## 3.69.0 (Unreleased)
2+
3+
### Added
4+
- Support for pod security policy in kubernetes
5+
- Support for Oracle Big Data Service
6+
- Support for application definition parameters update in dataflow application
7+
- Support for Cross Region Replication
8+
- Support for Secrets Management Service's `oci_vault_secret` and `oci_vault_secret_version` datasources
9+
- Support for Retention Rules that control object immutability
10+
211
## 3.68.0 (March 25, 2020)
312

413
### Added

‎examples/bds/main.tf‎

Lines changed: 185 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,185 @@
1+
// Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
2+
3+
variable "tenancy_ocid" {}
4+
variable "user_ocid" {}
5+
variable "fingerprint" {}
6+
variable "private_key_path" {}
7+
variable "region" {}
8+
variable "compartment_id" {}
9+
10+
variable "bds_instance_cluster_admin_password" {
11+
default = "V2VsY29tZTE="
12+
}
13+
14+
variable "bds_instance_cluster_public_key" {
15+
default = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDpUa4zUZKyU3AkW9yoJTBDO550wpWZOXdHswfRq75gbJ2ZYlMtifvwiO3qUL/RIZSC6e1wA5OL2LQ97UaHrLLPXgjvKGVIDRHqPkzTOayjJ4ZA7NPNhcu6f/OxhKkCYF3TAQObhMJmUSMrWSUeufaRIujDz1HHqazxOgFk09fj4i2dcGnfPcm32t8a9MzlsHSmgexYCUwxGisuuWTsnMgxbqsj6DaY51l+SEPi5tf10iFmUWqziF0eKDDQ/jHkwLJ8wgBJef9FSOmwJReHcBY+NviwFTatGj7Cwtnks6CVomsFD+rAMJ9uzM8SCv5agYunx07hnEXbR9r/TXqgXGfN [email protected]"
16+
}
17+
18+
variable "bds_instance_cluster_version" {
19+
default = "CDH6"
20+
}
21+
22+
variable "bds_instance_defined_tags_value" {
23+
default = "value"
24+
}
25+
26+
variable "bds_instance_display_name" {
27+
default = "displayName2"
28+
}
29+
30+
variable "bds_instance_freeform_tags" {
31+
default = {
32+
"bar-key" = "value"
33+
}
34+
}
35+
36+
variable "bds_instance_is_high_availability" {
37+
default = false
38+
}
39+
40+
variable "bds_instance_is_secure" {
41+
default = false
42+
}
43+
44+
variable "bds_instance_network_config_cidr_block" {
45+
default = "111.112.0.0/16"
46+
}
47+
48+
variable "bds_instance_network_config_is_nat_gateway_required" {
49+
default = false
50+
}
51+
52+
variable "bds_instance_nodes_block_volume_size_in_gbs" {
53+
default = 150
54+
}
55+
56+
variable "bds_instance_worker_nodes_block_volume_size_in_gbs" {
57+
default = 150
58+
}
59+
60+
variable "bds_instance_nodes_shape" {
61+
default = "VM.Standard2.4"
62+
}
63+
64+
variable "bds_instance_worker_node_shape" {
65+
default = "VM.Standard2.1"
66+
}
67+
68+
variable "bds_instance_state" {
69+
default = "ACTIVE"
70+
}
71+
72+
variable "tag_namespace_description" {
73+
default = "Just a test"
74+
}
75+
76+
variable "tag_namespace_name" {
77+
default = "testexamples-tag-namespace"
78+
}
79+
80+
provider "oci" {
81+
tenancy_ocid = "${var.tenancy_ocid}"
82+
user_ocid = "${var.user_ocid}"
83+
fingerprint = "${var.fingerprint}"
84+
private_key_path = "${var.private_key_path}"
85+
region = "${var.region}"
86+
}
87+
88+
resource "oci_identity_tag_namespace" "tag-namespace1" {
89+
#Required
90+
compartment_id = "${var.tenancy_ocid}"
91+
description = "${var.tag_namespace_description}"
92+
name = "${var.tag_namespace_name}"
93+
}
94+
95+
resource "oci_identity_tag" "tag1" {
96+
#Required
97+
description = "tf example tag"
98+
name = "tf-example-tag"
99+
tag_namespace_id = "${oci_identity_tag_namespace.tag-namespace1.id}"
100+
}
101+
102+
resource "oci_core_vcn" "vcn_bds" {
103+
cidr_block = "111.111.0.0/16"
104+
compartment_id = "${var.compartment_id}"
105+
display_name = "BDS_VCN"
106+
dns_label = "bdsvcn"
107+
}
108+
109+
resource "oci_core_subnet" "regional_subnet_bds" {
110+
cidr_block = "111.111.0.0/24"
111+
display_name = "regionalSubnetBds"
112+
dns_label = "regionalbds"
113+
compartment_id = "${var.compartment_id}"
114+
vcn_id = "${oci_core_vcn.vcn_bds.id}"
115+
security_list_ids = ["${oci_core_vcn.vcn_bds.default_security_list_id}"]
116+
route_table_id = "${oci_core_vcn.vcn_bds.default_route_table_id}"
117+
dhcp_options_id = "${oci_core_vcn.vcn_bds.default_dhcp_options_id}"
118+
}
119+
120+
resource "oci_bds_bds_instance" "test_bds_instance" {
121+
#Required
122+
cluster_admin_password = "${var.bds_instance_cluster_admin_password}"
123+
cluster_public_key = "${var.bds_instance_cluster_public_key}"
124+
cluster_version = "${var.bds_instance_cluster_version}"
125+
compartment_id = "${var.compartment_id}"
126+
display_name = "${var.bds_instance_display_name}"
127+
is_high_availability = "${var.bds_instance_is_high_availability}"
128+
is_secure = "${var.bds_instance_is_secure}"
129+
130+
master_node {
131+
#Required
132+
shape = "${var.bds_instance_nodes_shape}"
133+
134+
subnet_id = "${oci_core_subnet.regional_subnet_bds.id}"
135+
block_volume_size_in_gbs = "${var.bds_instance_nodes_block_volume_size_in_gbs}"
136+
number_of_nodes = 1
137+
}
138+
139+
util_node {
140+
#Required
141+
shape = "${var.bds_instance_nodes_shape}"
142+
143+
subnet_id = "${oci_core_subnet.regional_subnet_bds.id}"
144+
block_volume_size_in_gbs = "${var.bds_instance_nodes_block_volume_size_in_gbs}"
145+
number_of_nodes = 1
146+
}
147+
148+
worker_node {
149+
#Required
150+
shape = "${var.bds_instance_worker_node_shape}"
151+
152+
subnet_id = "${oci_core_subnet.regional_subnet_bds.id}"
153+
block_volume_size_in_gbs = "${var.bds_instance_worker_nodes_block_volume_size_in_gbs}"
154+
number_of_nodes = 4
155+
}
156+
157+
# cloud_sql_details {
158+
# shape = "VM.Standard2.4"
159+
# block_volume_size_in_gbs = 1000
160+
# }
161+
162+
is_cloud_sql_configured = false
163+
#Optional
164+
defined_tags = "${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "${var.bds_instance_defined_tags_value}")}"
165+
freeform_tags = "${var.bds_instance_freeform_tags}"
166+
network_config {
167+
#Optional
168+
cidr_block = "${var.bds_instance_network_config_cidr_block}"
169+
is_nat_gateway_required = "${var.bds_instance_network_config_is_nat_gateway_required}"
170+
}
171+
}
172+
173+
data "oci_bds_bds_instances" "test_bds_instances" {
174+
#Required
175+
compartment_id = "${var.compartment_id}"
176+
177+
#Optional
178+
display_name = "${oci_bds_bds_instance.test_bds_instance.display_name}"
179+
state = "ACTIVE"
180+
}
181+
182+
data "oci_bds_bds_instance" "test_bds_instance" {
183+
#Required
184+
bds_instance_id = "${oci_bds_bds_instance.test_bds_instance.id}"
185+
}

‎examples/container_engine/main.tf‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,11 @@ resource "oci_containerengine_cluster" "test_cluster" {
127127
is_tiller_enabled = "true"
128128
}
129129

130+
admission_controller_options {
131+
#Optional
132+
is_pod_security_policy_enabled = true
133+
}
134+
130135
kubernetes_network_config {
131136
#Optional
132137
pods_cidr = "10.1.0.0/16"

‎examples/object_storage/bucket_with_replication/index.html‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<body>
4+
<h1>Welcome</h1>
5+
</body>
6+
</html>

‎examples/object_storage/bucket_with_replication/main.tf‎

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
// Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
2+
3+
/*
4+
* This example shows how to manage a bucket with a replication policy
5+
*/
6+
7+
variable "tenancy_ocid" {}
8+
9+
variable "user_ocid" {}
10+
variable "fingerprint" {}
11+
variable "private_key_path" {}
12+
variable "compartment_ocid" {}
13+
14+
variable "region" {
15+
default = "us-ashburn-1"
16+
}
17+
18+
//the object can be created from the object data in the other region
19+
locals {
20+
source_region = "${var.region}"
21+
}
22+
23+
provider "oci" {
24+
region = "${var.region}"
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+
}
30+
31+
resource "oci_objectstorage_bucket" "bucket1" {
32+
compartment_id = "${var.compartment_ocid}"
33+
namespace = "${data.oci_objectstorage_namespace.ns.namespace}"
34+
name = "tf-example-source-bucket"
35+
access_type = "NoPublicAccess"
36+
}
37+
38+
resource "oci_objectstorage_bucket" "bucket2" {
39+
compartment_id = "${var.compartment_ocid}"
40+
namespace = "${data.oci_objectstorage_namespace.ns.namespace}"
41+
name = "tf-example-destination-bucket"
42+
access_type = "NoPublicAccess"
43+
}
44+
45+
data "oci_objectstorage_bucket_summaries" "buckets" {
46+
compartment_id = "${var.compartment_ocid}"
47+
namespace = "${data.oci_objectstorage_namespace.ns.namespace}"
48+
49+
filter {
50+
name = "name"
51+
values = ["${oci_objectstorage_bucket.bucket1.name}", "${oci_objectstorage_bucket.bucket2.name}"]
52+
}
53+
}
54+
55+
output buckets {
56+
value = "${data.oci_objectstorage_bucket_summaries.buckets.bucket_summaries}"
57+
}
58+
59+
/*
60+
* This example file shows how to read and output the object storage namespace and namespace_metadata.
61+
*/
62+
63+
data "oci_objectstorage_namespace" "ns" {
64+
#Optional
65+
compartment_id = "${var.compartment_ocid}"
66+
}
67+
68+
output namespace {
69+
value = "${data.oci_objectstorage_namespace.ns.namespace}"
70+
}
71+
72+
resource "oci_objectstorage_namespace_metadata" "namespace-metadata1" {
73+
namespace = "${data.oci_objectstorage_namespace.ns.namespace}"
74+
default_s3compartment_id = "${var.compartment_ocid}"
75+
default_swift_compartment_id = "${var.compartment_ocid}"
76+
}
77+
78+
data oci_objectstorage_namespace_metadata namespace-metadata1 {
79+
namespace = "${data.oci_objectstorage_namespace.ns.namespace}"
80+
}
81+
82+
output namespace-metadata {
83+
value = <<EOF
84+
85+
namespace = ${data.oci_objectstorage_namespace_metadata.namespace-metadata1.namespace}
86+
default_s3compartment_id = ${data.oci_objectstorage_namespace_metadata.namespace-metadata1.default_s3compartment_id}
87+
default_swift_compartment_id = ${data.oci_objectstorage_namespace_metadata.namespace-metadata1.default_swift_compartment_id}
88+
EOF
89+
}
90+
91+
resource "oci_objectstorage_object" "object1" {
92+
namespace = "${data.oci_objectstorage_namespace.ns.namespace}"
93+
bucket = "${oci_objectstorage_bucket.bucket1.name}"
94+
object = "index.html"
95+
content_language = "en-US"
96+
content_type = "text/html"
97+
content = "${file("index.html")}"
98+
content_disposition = "attachment; filename=\"filename.html\""
99+
}
100+
101+
data "oci_objectstorage_objects" "objects1" {
102+
namespace = "${data.oci_objectstorage_namespace.ns.namespace}"
103+
bucket = "${oci_objectstorage_bucket.bucket1.name}"
104+
}
105+
106+
data "oci_objectstorage_object" "object" {
107+
namespace = "${data.oci_objectstorage_namespace.ns.namespace}"
108+
bucket = "${oci_objectstorage_bucket.bucket1.name}"
109+
object = "index.html"
110+
}
111+
112+
output objects {
113+
value = "${data.oci_objectstorage_objects.objects1.objects}"
114+
}
115+
116+
resource "oci_objectstorage_replication_policy" "bucket_rp" {
117+
namespace = "${data.oci_objectstorage_namespace.ns.namespace}"
118+
bucket = "${oci_objectstorage_bucket.bucket1.name}"
119+
name = "rpOnBucket"
120+
destination_region_name = "${var.region}"
121+
delete_object_in_destination_bucket = "ACCEPT"
122+
destination_bucket_name = "${oci_objectstorage_bucket.bucket2.name}"
123+
}

‎examples/object_storage/retentionrule.tf‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
// Copyright (c) 2017, 2019, 2020, Oracle and/or its affiliates. All rights reserved.
2+
3+
/*
4+
* This example shows how to manage a retention rule within a bucket
5+
*/
6+
7+
resource "oci_objectstorage_bucket" "retention_rule_bucket" {
8+
compartment_id = "${var.compartment_ocid}"
9+
namespace = "${data.oci_objectstorage_namespace.ns.namespace}"
10+
name = "tf-example-bucket-with-retention-rule"
11+
access_type = "NoPublicAccess"
12+
13+
retention_rules {
14+
display_name = "tf-example-retention-rule"
15+
16+
duration {
17+
time_amount = "10"
18+
time_unit = "DAYS"
19+
}
20+
21+
time_rule_locked = "2120-05-04T17:23:46Z"
22+
}
23+
}
24+
25+
data "oci_objectstorage_bucket" "retention_rule_bucket" {
26+
namespace = "${data.oci_objectstorage_namespace.ns.namespace}"
27+
name = "tf-example-bucket-with-retention-rule"
28+
}
29+
30+
output "retention_rules_on_bucket" {
31+
value = "${data.oci_objectstorage_bucket.retention_rule_bucket.retention_rules}"
32+
}

0 commit comments

Comments
 (0)