sync examples from Provider v1.248.0

Author: github-actions[bot]

quickstarts/Cloud_SSO/101-cloud-sso-directory-docs-Example/README.md

@@ -18,7 +18,6 @@ No modules.
 | Name | Type |
 |------|------|
 | [alicloud_cloud_sso_directory.default](https://registry.terraform.io/providers/aliyun/alicloud/latest/docs/resources/cloud_sso_directory) | resource |
-| [alicloud_cloud_sso_directories.default](https://registry.terraform.io/providers/aliyun/alicloud/latest/docs/data-sources/cloud_sso_directories) | data source |
 
 ## Inputs
 

quickstarts/Cloud_SSO/101-cloud-sso-directory-docs-Example/main.tf

@@ -1,12 +1,11 @@
 variable "name" {
   default = "tf-example"
 }
+
 provider "alicloud" {
   region = "cn-shanghai"
 }
-data "alicloud_cloud_sso_directories" "default" {}
 
 resource "alicloud_cloud_sso_directory" "default" {
-  count          = length(data.alicloud_cloud_sso_directories.default.ids) > 0 ? 0 : 1
   directory_name = var.name
 }

quickstarts/Container_Service_for_Kubernetes(ACK)/101-cs-edge-kubernetes-docs-Example-01/main.tf

@@ -23,20 +23,22 @@ resource "alicloud_vswitch" "default" {
 }
 
 resource "alicloud_cs_edge_kubernetes" "default" {
-  name_prefix                  = var.name
-  worker_vswitch_ids           = [alicloud_vswitch.default.id]
-  worker_instance_types        = [data.alicloud_instance_types.default.instance_types.0.id]
-  version                      = "1.26.3-aliyun.1"
-  worker_number                = "1"
-  password                     = "Test12345"
-  pod_cidr                     = "10.99.0.0/16"
-  service_cidr                 = "172.16.0.0/16"
-  worker_instance_charge_type  = "PostPaid"
-  new_nat_gateway              = "true"
-  node_cidr_mask               = "24"
-  install_cloud_monitor        = "true"
-  slb_internet_enabled         = "true"
-  is_enterprise_security_group = "true"
+  name_prefix                    = var.name
+  worker_vswitch_ids             = [alicloud_vswitch.default.id]
+  worker_instance_types          = [data.alicloud_instance_types.default.instance_types.0.id]
+  version                        = "1.26.3-aliyun.1"
+  worker_number                  = 1
+  password                       = "Test12345"
+  pod_cidr                       = "10.99.0.0/16"
+  service_cidr                   = "172.16.0.0/16"
+  worker_instance_charge_type    = "PostPaid"
+  new_nat_gateway                = true
+  node_cidr_mask                 = 24
+  install_cloud_monitor          = true
+  slb_internet_enabled           = true
+  is_enterprise_security_group   = true
+  skip_set_certificate_authority = true
+
   worker_data_disks {
     category  = "cloud_ssd"
     size      = "200"

quickstarts/Container_Service_for_Kubernetes(ACK)/101-cs-edge-kubernetes-docs-Example-02/main.tf

@@ -23,21 +23,22 @@ resource "alicloud_vswitch" "default" {
 }
 
 resource "alicloud_cs_edge_kubernetes" "default" {
-  name_prefix                  = var.name
-  worker_vswitch_ids           = [alicloud_vswitch.default.id]
-  worker_instance_types        = [data.alicloud_instance_types.default.instance_types.0.id]
-  cluster_spec                 = "ack.pro.small"
-  worker_number                = "1"
-  password                     = "Test12345"
-  pod_cidr                     = "10.99.0.0/16"
-  service_cidr                 = "172.16.0.0/16"
-  worker_instance_charge_type  = "PostPaid"
-  new_nat_gateway              = "true"
-  node_cidr_mask               = "24"
-  load_balancer_spec           = "slb.s2.small"
-  install_cloud_monitor        = "true"
-  slb_internet_enabled         = "true"
-  is_enterprise_security_group = "true"
+  name_prefix                    = var.name
+  worker_vswitch_ids             = [alicloud_vswitch.default.id]
+  worker_instance_types          = [data.alicloud_instance_types.default.instance_types.0.id]
+  cluster_spec                   = "ack.pro.small"
+  worker_number                  = 1
+  password                       = "Test12345"
+  pod_cidr                       = "10.99.0.0/16"
+  service_cidr                   = "172.16.0.0/16"
+  worker_instance_charge_type    = "PostPaid"
+  new_nat_gateway                = true
+  node_cidr_mask                 = 24
+  load_balancer_spec             = "slb.s2.small"
+  install_cloud_monitor          = true
+  slb_internet_enabled           = true
+  is_enterprise_security_group   = true
+  skip_set_certificate_authority = true
 
   worker_data_disks {
     category  = "cloud_ssd"

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

@@ -120,22 +120,23 @@ data "alicloud_instance_types" "cloud_essd" {
 }
 
 resource "alicloud_cs_kubernetes" "default" {
-  master_vswitch_ids    = length(var.vswitch_ids) > 0 ? split(",", join(",", var.vswitch_ids)) : length(var.vswitch_cidrs) < 1 ? [] : split(",", join(",", alicloud_vswitch.vswitches.*.id))
-  pod_vswitch_ids       = length(var.terway_vswitch_ids) > 0 ? split(",", join(",", var.terway_vswitch_ids)) : length(var.terway_vswitch_cidrs) < 1 ? [] : split(",", join(",", alicloud_vswitch.terway_vswitches.*.id))
-  master_instance_types = [data.alicloud_instance_types.cloud_essd.0.instance_types.0.id, data.alicloud_instance_types.cloud_essd.1.instance_types.0.id, data.alicloud_instance_types.cloud_essd.2.instance_types.0.id]
-  master_disk_category  = "cloud_essd"
-  password              = "Yourpassword1234"
-  service_cidr          = "172.18.0.0/16"
-  install_cloud_monitor = "true"
-  resource_group_id     = data.alicloud_resource_manager_resource_groups.default.groups.0.id
-  deletion_protection   = "false"
-  timezone              = "Asia/Shanghai"
-  os_type               = "Linux"
-  platform              = "AliyunLinux3"
-  cluster_domain        = "cluster.local"
-  proxy_mode            = "ipvs"
-  custom_san            = "www.terraform.io"
-  new_nat_gateway       = "true"
+  master_vswitch_ids             = length(var.vswitch_ids) > 0 ? split(",", join(",", var.vswitch_ids)) : length(var.vswitch_cidrs) < 1 ? [] : split(",", join(",", alicloud_vswitch.vswitches.*.id))
+  pod_vswitch_ids                = length(var.terway_vswitch_ids) > 0 ? split(",", join(",", var.terway_vswitch_ids)) : length(var.terway_vswitch_cidrs) < 1 ? [] : split(",", join(",", alicloud_vswitch.terway_vswitches.*.id))
+  master_instance_types          = [data.alicloud_instance_types.cloud_essd.0.instance_types.0.id, data.alicloud_instance_types.cloud_essd.1.instance_types.0.id, data.alicloud_instance_types.cloud_essd.2.instance_types.0.id]
+  master_disk_category           = "cloud_essd"
+  password                       = "Yourpassword1234"
+  service_cidr                   = "172.18.0.0/16"
+  install_cloud_monitor          = true
+  resource_group_id              = data.alicloud_resource_manager_resource_groups.default.groups.0.id
+  deletion_protection            = false
+  timezone                       = "Asia/Shanghai"
+  os_type                        = "Linux"
+  platform                       = "AliyunLinux3"
+  cluster_domain                 = "cluster.local"
+  proxy_mode                     = "ipvs"
+  custom_san                     = "www.terraform.io"
+  new_nat_gateway                = true
+  skip_set_certificate_authority = true
   dynamic "addons" {
     for_each = var.cluster_addons
     content {

quickstarts/Container_Service_for_Kubernetes(ACK)/101-cs-kubernetes-node-pool-docs-Example/main.tf

@@ -32,7 +32,7 @@ resource "alicloud_vswitch" "default" {
 resource "alicloud_cs_managed_kubernetes" "default" {
   name_prefix          = "terraform-example-${random_integer.default.result}"
   cluster_spec         = "ack.pro.small"
-  worker_vswitch_ids   = [alicloud_vswitch.default.id]
+  vswitch_ids          = [alicloud_vswitch.default.id]
   new_nat_gateway      = true
   pod_cidr             = cidrsubnet("10.0.0.0/8", 8, 36)
   service_cidr         = cidrsubnet("172.16.0.0/16", 4, 7)
@@ -140,7 +140,7 @@ resource "alicloud_cs_kubernetes_node_pool" "spot_instance" {
   key_name             = alicloud_key_pair.default.key_pair_name
 
   # you need to specify the number of nodes in the node pool, which can be 0
-  desired_size = 1
+  desired_size = 0
 
   # spot config
   spot_strategy = "SpotWithPriceLimit"

quickstarts/Container_Service_for_Kubernetes(ACK)/101-cs-managed-kubernetes-docs-Example/main.tf

@@ -84,13 +84,14 @@ resource "alicloud_cs_managed_kubernetes" "k8s" {
   name         = var.name
   cluster_spec = "ack.pro.small"
   # version can not be defined in variables.tf.
-  # version            = "1.26.3-aliyun.1"
-  vswitch_ids     = length(var.vswitch_ids) > 0 ? split(",", join(",", var.vswitch_ids)) : length(var.vswitch_cidrs) < 1 ? [] : split(",", join(",", alicloud_vswitch.vswitches.*.id))
-  pod_vswitch_ids = length(var.terway_vswitch_ids) > 0 ? split(",", join(",", var.terway_vswitch_ids)) : length(var.terway_vswitch_cidrs) < 1 ? [] : split(",", join(",", alicloud_vswitch.terway_vswitches.*.id))
-  new_nat_gateway = true
-  node_cidr_mask  = var.node_cidr_mask
-  proxy_mode      = var.proxy_mode
-  service_cidr    = var.service_cidr
+  # version                        = "1.26.3-aliyun.1"
+  vswitch_ids                    = length(var.vswitch_ids) > 0 ? split(",", join(",", var.vswitch_ids)) : length(var.vswitch_cidrs) < 1 ? [] : split(",", join(",", alicloud_vswitch.vswitches.*.id))
+  pod_vswitch_ids                = length(var.terway_vswitch_ids) > 0 ? split(",", join(",", var.terway_vswitch_ids)) : length(var.terway_vswitch_cidrs) < 1 ? [] : split(",", join(",", alicloud_vswitch.terway_vswitches.*.id))
+  new_nat_gateway                = true
+  node_cidr_mask                 = var.node_cidr_mask
+  proxy_mode                     = var.proxy_mode
+  service_cidr                   = var.service_cidr
+  skip_set_certificate_authority = true
 
   addons {
     name = "terway-eniip"

quickstarts/Container_Service_for_Kubernetes(ACK)/101-cs-serverless-kubernetes-docs-Example/main.tf

@@ -26,32 +26,12 @@ resource "alicloud_cs_serverless_kubernetes" "serverless" {
   new_nat_gateway                = true
   endpoint_public_access_enabled = true
   deletion_protection            = false
-
-  load_balancer_spec      = "slb.s2.small"
-  time_zone               = "Asia/Shanghai"
-  service_cidr            = "172.21.0.0/20"
-  service_discovery_types = ["PrivateZone"]
-  # Enable log service, A project named k8s-log-{ClusterID} will be automatically created
-  logging_type = "SLS"
+  time_zone                      = "Asia/Shanghai"
+  service_cidr                   = "172.21.0.0/20"
 
   # tags
   tags = {
     "k-aa" = "v-aa"
-    "k-bb" = "v-aa"
-  }
-
-  # addons
-  addons {
-    # ALB Ingress
-    name = "alb-ingress-controller"
-  }
-  addons {
-    name = "metrics-server"
-  }
-  addons {
-    name = "knative"
-  }
-  addons {
-    name = "arms-prometheus"
+    "k-bb" = "v-bb"
   }
 }

quickstarts/ECS/101-security-group-rule-docs-Example/main.tf

@@ -1,10 +1,10 @@
 resource "alicloud_security_group" "default" {
-  name = "default"
+  security_group_name = "default"
 }
 resource "alicloud_security_group_rule" "allow_all_tcp" {
   type              = "ingress"
   ip_protocol       = "tcp"
-  nic_type          = "internet"
+  nic_type          = "intranet"
   policy            = "accept"
   port_range        = "1/65535"
   priority          = 1

quickstarts/ENS/101-ens-eip-docs-Example/main.tf

@@ -3,12 +3,11 @@ variable "name" {
 }
 
 resource "alicloud_ens_eip" "default" {
-  description   = "EipDescription_autotest"
-  bandwidth     = "5"
-  isp           = "cmcc"
-  payment_type  = "PayAsYouGo"
-  ens_region_id = "cn-chenzhou-telecom_unicom_cmcc"
-  eip_name      = var.name
-
+  description          = "EipDescription_autotest"
+  bandwidth            = "5"
+  isp                  = "cmcc"
+  payment_type         = "PayAsYouGo"
+  ens_region_id        = "cn-chenzhou-telecom_unicom_cmcc"
+  eip_name             = var.name
   internet_charge_type = "95BandwidthByMonth"
 }