Skip to content

Commit 6bfdb64

Browse files
sync examples from Provider v1.257.0
1 parent a3ce9bb commit 6bfdb64

File tree

19 files changed

+307
-10
lines changed

19 files changed

+307
-10
lines changed

quickstarts/Container_Service_for_Kubernetes(ACK)/101-cs-autoscaling-config-docs-Example/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,11 @@ No modules.
1818
| Name | Type |
1919
|------|------|
2020
| [alicloud_cs_autoscaling_config.default](https://registry.terraform.io/providers/aliyun/alicloud/latest/docs/resources/cs_autoscaling_config) | resource |
21+
| [alicloud_cs_kubernetes_node_pool.default](https://registry.terraform.io/providers/aliyun/alicloud/latest/docs/resources/cs_kubernetes_node_pool) | resource |
2122
| [alicloud_cs_managed_kubernetes.default](https://registry.terraform.io/providers/aliyun/alicloud/latest/docs/resources/cs_managed_kubernetes) | resource |
2223
| [alicloud_vpc.default](https://registry.terraform.io/providers/aliyun/alicloud/latest/docs/resources/vpc) | resource |
2324
| [alicloud_vswitch.default](https://registry.terraform.io/providers/aliyun/alicloud/latest/docs/resources/vswitch) | resource |
25+
| [alicloud_instance_types.default](https://registry.terraform.io/providers/aliyun/alicloud/latest/docs/data-sources/instance_types) | data source |
2426
| [alicloud_zones.default](https://registry.terraform.io/providers/aliyun/alicloud/latest/docs/data-sources/zones) | data source |
2527

2628
## Inputs

quickstarts/Container_Service_for_Kubernetes(ACK)/101-cs-autoscaling-config-docs-Example/main.tf

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@ variable "name" {
44
data "alicloud_zones" "default" {
55
available_resource_creation = "VSwitch"
66
}
7+
data "alicloud_instance_types" "default" {
8+
availability_zone = data.alicloud_zones.default.zones.0.id
9+
cpu_core_count = 4
10+
memory_size = 8
11+
kubernetes_node_role = "Worker"
12+
system_disk_category = "cloud_essd"
13+
}
714

815
resource "alicloud_vpc" "default" {
916
vpc_name = var.name
@@ -26,6 +33,22 @@ resource "alicloud_cs_managed_kubernetes" "default" {
2633
slb_internet_enabled = true
2734
}
2835

36+
resource "alicloud_cs_kubernetes_node_pool" "default" {
37+
count = 3
38+
node_pool_name = format("%s-%d", var.name, count.index)
39+
cluster_id = alicloud_cs_managed_kubernetes.default.id
40+
vswitch_ids = [alicloud_vswitch.default.id]
41+
instance_types = [data.alicloud_instance_types.default.instance_types.0.id]
42+
system_disk_category = "cloud_essd"
43+
system_disk_size = 40
44+
image_type = "AliyunLinux3"
45+
scaling_config {
46+
enable = true
47+
min_size = 0
48+
max_size = 10
49+
}
50+
}
51+
2952
resource "alicloud_cs_autoscaling_config" "default" {
3053
cluster_id = alicloud_cs_managed_kubernetes.default.id
3154
// configure auto scaling
@@ -35,13 +58,20 @@ resource "alicloud_cs_autoscaling_config" "default" {
3558
gpu_utilization_threshold = "0.5"
3659
scan_interval = "30s"
3760
scale_down_enabled = true
38-
expander = "least-waste"
61+
expander = "priority"
3962
skip_nodes_with_system_pods = true
4063
skip_nodes_with_local_storage = false
4164
daemonset_eviction_for_nodes = false
4265
max_graceful_termination_sec = 14400
4366
min_replica_count = 0
4467
recycle_node_deletion_enabled = false
4568
scale_up_from_zero = true
46-
scaler_type = "goatscaler"
69+
scaler_type = "cluster-autoscaler"
70+
priorities = {
71+
10 = join(",", [
72+
alicloud_cs_kubernetes_node_pool.default[0].scaling_group_id,
73+
alicloud_cs_kubernetes_node_pool.default[1].scaling_group_id,
74+
])
75+
20 = alicloud_cs_kubernetes_node_pool.default[2].scaling_group_id
76+
}
4777
}

quickstarts/Eflo/101-eflo-node-group-attachment-docs-Example/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ No modules.
2323

2424
| Name | Description | Type | Default | Required |
2525
|------|-------------|------|---------|:--------:|
26-
| <a name="input_name"></a> [name](#input\_name) | Before executing this example, you need to confirm with the product team whether the resources are sufficient or you will get an error message with "Failure to check order before create instance" | `string` | `"terraform-example"` | no |
26+
| <a name="input_name"></a> [name](#input\_name) | n/a | `string` | `"terraform-example"` | no |
2727
<!-- END_TF_DOCS -->
Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# Before executing this example, you need to confirm with the product team whether the resources are sufficient or you will get an error message with "Failure to check order before create instance"
21
variable "name" {
32
default = "terraform-example"
43
}
@@ -9,11 +8,11 @@ provider "alicloud" {
98

109

1110
resource "alicloud_eflo_node_group_attachment" "default" {
12-
vswitch_id = "vsw-xxx"
13-
hostname = "attachment-example"
11+
vswitch_id = "vsw-uf63gbmvwgreao66opmie"
12+
hostname = "attachment-example-e01-cn-smw4d1bzd0a"
1413
login_password = "G7f$2kL9@vQx3Zp5*"
15-
cluster_id = "i118976xxxx"
16-
node_group_id = "i127582xxxx"
17-
node_id = "e01-cn-xxxx"
18-
vpc_id = "vpc-xxx"
14+
cluster_id = "i118976621753269898628"
15+
node_group_id = "i127582271753269898630"
16+
node_id = "e01-cn-smw4d1bzd0a"
17+
vpc_id = "vpc-uf6t73bb01dfprb2qvpqa"
1918
}

quickstarts/Microservice_Engine(MSE)/101-mse-cluster-docs-Example/main.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ resource "alicloud_mse_cluster" "example" {
1919
cluster_specification = "MSE_SC_1_2_60_c"
2020
cluster_type = "Nacos-Ans"
2121
cluster_version = "NACOS_2_0_0"
22+
version_code = "NACOS_2_3_2_1"
2223
instance_count = 3
2324
net_type = "privatenet"
2425
pub_network_flow = "1"
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
## Introduction
2+
3+
This example is used to create a `alicloud_mongodb_global_security_ip_group` resource.
4+
5+
<!-- BEGIN_TF_DOCS -->
6+
## Providers
7+
8+
| Name | Version |
9+
|------|---------|
10+
| <a name="provider_alicloud"></a> [alicloud](#provider\_alicloud) | n/a |
11+
12+
## Modules
13+
14+
No modules.
15+
16+
## Resources
17+
18+
| Name | Type |
19+
|------|------|
20+
| [alicloud_mongodb_global_security_ip_group.default](https://registry.terraform.io/providers/aliyun/alicloud/latest/docs/resources/mongodb_global_security_ip_group) | resource |
21+
22+
## Inputs
23+
24+
| Name | Description | Type | Default | Required |
25+
|------|-------------|------|---------|:--------:|
26+
| <a name="input_name"></a> [name](#input\_name) | n/a | `string` | `"terraformexample"` | no |
27+
<!-- END_TF_DOCS -->
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
variable "name" {
2+
default = "terraformexample"
3+
}
4+
5+
resource "alicloud_mongodb_global_security_ip_group" "default" {
6+
global_ig_name = var.name
7+
global_security_ip_list = "192.168.1.1,192.168.1.2,192.168.1.3"
8+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
terraform {
2+
required_providers {
3+
alicloud = {
4+
source = "aliyun/alicloud"
5+
}
6+
}
7+
}

quickstarts/OSS/101-oss-bucket-docs-Example-11/main.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
0
12
resource "random_integer" "default" {
23
max = 99999
34
min = 10000

quickstarts/OSS/101-oss-bucket-docs-Example-12/main.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
1
12
resource "random_integer" "default" {
23
max = 99999
34
min = 10000

0 commit comments

Comments
 (0)