Replace deprecation parameter add example.

zql-tqy · xiaozhu36 · commit 16814bac5569 · 2020-06-16T16:13:09.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,14 @@
+## 1.2.0 (Unreleased)
+## 1.2.0 (Jun 16,2020)
+
+IMPROVEMENTS
+
+- Replace deprecation parameter add example. [GH-4]( https://github.com/terraform-alicloud-modules/terraform-alicloud-kubernetes/pull/4)
+
+## 1.1.0 (Sep 24, 2019)
+
+IMPROVEMENTS
+
+- fix kubernetes module. [GH-2]( https://github.com/terraform-alicloud-modules/terraform-alicloud-kubernetes/pull/2)
+
+- imporve(kubernetes): update the module to the format of the new version. [GH-1]( https://github.com/terraform-alicloud-modules/terraform-alicloud-kubernetes/pull/1)
diff --git a/README.md b/README.md
@@ -12,6 +12,9 @@ These types of the module resource are supported:
 - [Nat Gateway](https://www.terraform.io/docs/providers/alicloud/r/nat_gateway.html)
 - [Kubernetes](https://www.terraform.io/docs/providers/alicloud/r/cs_kubernetes.html)
 
+Terraform version
+-----------------
+The Module requires Terraform 0.12 and Terraform Provider AliCloud 1.75.0+.
 
 Usage
 -----
@@ -58,13 +61,70 @@ You can specify the following user-defined arguments:
 * vswitch_name_prefix: The name prefix of several vswitches
 * vswitch_cidrs: List of cidr blocks for several new vswitches
 
+```hcl
+variable "profile" {
+  default = "default"
+}
+
+variable "region" {
+  default = "cn-hangzhou"
+}
+
+data "alicloud_vpcs" "default" {
+  is_default = true
+}
+
+module "k8s" {
+  source = "../"
+  region = var.region
+
+  new_nat_gateway       = true
+  vpc_name              = "tf-k8s-vpc"
+  vpc_cidr              = "10.0.0.0/8"
+  vswitch_name_prefix   = "tf-k8s-vsw"
+  vswitch_cidrs         = ["10.1.0.0/16", "10.2.0.0/16", "10.3.0.0/16"]
+  master_instance_types = ["ecs.n1.medium", "ecs.c5.large", "ecs.n1.medium"]
+  worker_instance_types = ["ecs.n1.medium"]
+  k8s_pod_cidr          = "192.168.5.0/24"
+  k8s_service_cidr      = "192.168.2.0/24"
+  k8s_worker_number     = 2
+}
+```
+
 ### 2. Using existing vpc and vswitches for the cluster.
 
 You can specify the following user-defined arguments:
 
 * vpc_id: A existing vpc ID
 * vswitch_ids: List of IDs for several existing vswitches
 
+```hcl
+variable "profile" {
+  default = "default"
+}
+
+variable "region" {
+  default = "cn-hangzhou"
+}
+
+data "alicloud_vpcs" "default" {
+  is_default = true
+}
+
+module "k8s" {
+  source = "../"
+  region = var.region
+
+  vpc_id                = data.alicloud_vpcs.default.vpcs.0.id
+  vswitch_ids           = ["vsw-bp1pog8voc3f42arr****", "vsw-bp1jxetj1386gqssg****", "vsw-bp1s1835sq5tjss9s****"]
+  master_instance_types = ["ecs.n1.medium", "ecs.c5.large", "ecs.n1.medium"]
+  worker_instance_types = ["ecs.n1.medium"]
+  k8s_pod_cidr          = "192.168.5.0/24"
+  k8s_service_cidr      = "192.168.2.0/24"
+  k8s_worker_number     = 2
+}
+```
+
 ### 3. Using existing vpc, vswitches and nat gateway for the cluster.
 
 You can specify the following user-defined arguments:
@@ -74,10 +134,43 @@ You can specify the following user-defined arguments:
 * new_nat_gateway: Set it to false. But you must ensure you specified vswitches can access internet.
 In other words, you must set snat entry for each vswitch before running the example.
 
+```hcl
+variable "profile" {
+  default = "default"
+}
 
-Terraform version
------------------
-Terraform version 0.11.0 or newer and Provider version 1.9.0 or newer are required for this example to work.
+variable "region" {
+  default = "cn-hangzhou"
+}
+
+data "alicloud_vpcs" "default" {
+  is_default = true
+}
+
+module "k8s" {
+  source = "../"
+  region = var.region
+
+  new_nat_gateway       = false
+  vpc_id                = data.alicloud_vpcs.default.vpcs.0.id
+  vswitch_ids           = ["vsw-bp1pog8voc3f42arr****", "vsw-bp1jxetj1386gqssg****", "vsw-bp1s1835sq5tjss9s****"]
+  master_instance_types = ["ecs.n1.medium", "ecs.c5.large", "ecs.n1.medium"]
+  worker_instance_types = ["ecs.n1.medium"]
+  k8s_pod_cidr          = "192.168.5.0/24"
+  k8s_service_cidr      = "192.168.2.0/24"
+  k8s_worker_number     = 2
+}
+```
+
+## Examples
+
+* [complete example](https://github.com/terraform-alicloud-modules/terraform-alicloud-kubernetes/tree/master/examples/complete)
+
+Submit Issues
+-------------
+If you have any problems when using this module, please opening a [provider issue](https://github.com/terraform-providers/terraform-provider-alicloud/issues/new) and let us know.
+
+**Note:** There does not recommend to open an issue on this repo.
 
 Authors
 -------
diff --git a/examples/complete/README.md b/examples/complete/README.md
@@ -0,0 +1,16 @@
+Terraform module for creating Kubernetes Cluster on Alibaba Cloud.  
+terraform-alicloud-kubernetes
+=====================================================================
+
+## Usage
+
+To run this example you need to execute:
+
+```bash
+$ terraform init
+$ terraform plan
+$ terraform apply
+```
+
+Note that this example will create resources which cost money. Run `terraform destroy` when you don't need these resources.
+
diff --git a/examples/complete/main.tf b/examples/complete/main.tf
@@ -0,0 +1,25 @@
+variable "profile" {
+  default = "default"
+}
+
+variable "region" {
+  default = "cn-hangzhou"
+}
+
+data "alicloud_vpcs" "default" {
+  is_default = true
+}
+
+module "k8s" {
+  source = "../.."
+  region = var.region
+
+  new_nat_gateway       = false
+  vpc_id                = data.alicloud_vpcs.default.vpcs.0.id
+  vswitch_ids           = ["vsw-bp1pog8voc3f42arr****", "vsw-bp1jxetj1386gqssg****", "vsw-bp1s1835sq5tjss9s****"]
+  master_instance_types = ["ecs.n1.medium", "ecs.c5.large", "ecs.n1.medium"]
+  worker_instance_types = ["ecs.n1.medium"]
+  k8s_pod_cidr          = "192.168.5.0/24"
+  k8s_service_cidr      = "192.168.2.0/24"
+  k8s_worker_number     = 2
+}
diff --git a/examples/complete/outputs.tf b/examples/complete/outputs.tf
@@ -0,0 +1,31 @@
+// Output VPC
+output "vpc_id" {
+  description = "The ID of the VPC."
+  value       = module.k8s.vpc_id
+}
+
+output "vswitch_ids" {
+  description = "List ID of the VSwitches."
+  value       = module.k8s.vswitch_ids
+}
+
+output "nat_gateway_id" {
+  value = module.k8s.nat_gateway_id
+}
+
+// Output kubernetes resource
+output "cluster_id" {
+  description = "ID of the kunernetes cluster."
+  value       = module.k8s.cluster_id
+}
+
+output "security_group_id" {
+  description = "ID of the Security Group used to deploy kubernetes cluster."
+  value       = module.k8s.security_group_id
+}
+
+output "cluster_nodes" {
+  description = "List nodes of cluster."
+  value       = module.k8s.cluster_nodes
+}
+
diff --git a/main.tf b/main.tf
@@ -1,8 +1,10 @@
 // Provider specific configs
 provider "alicloud" {
-  version              = ">=1.56.0"
-  region               = var.region != "" ? var.region : null
-  configuration_source = "terraform-alicloud-modules/kubernetes"
+  profile                 = var.profile != "" ? var.profile : null
+  shared_credentials_file = var.shared_credentials_file != "" ? var.shared_credentials_file : null
+  region                  = var.region
+  skip_region_validation  = var.skip_region_validation
+  configuration_source    = "terraform-alicloud-modules/kubernetes"
 }
 
 // Instance_types data source for instance_type
@@ -41,31 +43,33 @@ resource "alicloud_vswitch" "vswitches" {
 }
 
 resource "alicloud_nat_gateway" "default" {
-  count  = var.new_nat_gateway == "true" ? 1 : 0
+  count  = var.new_nat_gateway == true ? 1 : 0
   vpc_id = var.vpc_id == "" ? join("", alicloud_vpc.vpc.*.id) : var.vpc_id
   name   = var.example_name
 }
 
 resource "alicloud_eip" "default" {
-  count     = var.new_nat_gateway == "true" ? 1 : 0
+  count     = var.new_nat_gateway == true ? 1 : 0
   bandwidth = 10
 }
 
 resource "alicloud_eip_association" "default" {
-  count         = var.new_nat_gateway == "true" ? 1 : 0
+  count         = var.new_nat_gateway == true ? 1 : 0
   allocation_id = alicloud_eip.default[0].id
   instance_id   = alicloud_nat_gateway.default[0].id
 }
 
 resource "alicloud_snat_entry" "default" {
-  count         = var.new_nat_gateway == "false" ? 0 : length(var.vswitch_ids) > 0 ? length(var.vswitch_ids) : length(var.vswitch_cidrs)
-  snat_table_id = alicloud_nat_gateway.default[0].snat_table_ids
+  count             = var.new_nat_gateway == false ? 0 : length(var.vswitch_ids) > 0 ? length(var.vswitch_ids) : length(var.vswitch_cidrs)
+  snat_table_id     = alicloud_nat_gateway.default[0].snat_table_ids
   source_vswitch_id = length(var.vswitch_ids) > 0 ? split(",", join(",", var.vswitch_ids))[count.index % length(split(",", join(",", var.vswitch_ids)))] : length(var.vswitch_cidrs) < 1 ? "" : split(",", join(",", alicloud_vswitch.vswitches.*.id))[count.index % length(split(",", join(",", alicloud_vswitch.vswitches.*.id)))]
-  snat_ip = alicloud_eip.default[0].ip_address
+  snat_ip           = alicloud_eip.default[0].ip_address
+  depends_on        = [alicloud_eip_association.default]
 }
 
 resource "alicloud_cs_kubernetes" "k8s" {
   count = var.k8s_number
+
   name = var.k8s_name_prefix == "" ? format(
     "%s-%s",
     var.example_name,
@@ -75,22 +79,26 @@ resource "alicloud_cs_kubernetes" "k8s" {
     var.k8s_name_prefix,
     format(var.number_format, count.index + 1),
   )
-  vswitch_ids = [length(var.vswitch_ids) > 0 ? split(",", join(",", var.vswitch_ids))[count.index%length(split(",", join(",", var.vswitch_ids)))] : length(var.vswitch_cidrs) < 1 ? "" : split(",", join(",", alicloud_vswitch.vswitches.*.id))[count.index%length(split(",", join(",", alicloud_vswitch.vswitches.*.id)))]]
-
-  new_nat_gateway       = false
-  master_disk_category  = var.master_disk_category
-  worker_disk_category  = var.worker_disk_category
-  master_disk_size      = var.master_disk_size
-  worker_disk_size      = var.master_disk_size
-  password              = var.ecs_password
+  master_vswitch_ids    = length(var.vswitch_ids) > 0 ? split(",", join(",", var.vswitch_ids)) : length(var.vswitch_cidrs) < 1 ? [] : split(",", join(",", alicloud_vswitch.vswitches.*.id))
+  worker_vswitch_ids    = length(var.vswitch_ids) > 0 ? split(",", join(",", var.vswitch_ids)) : length(var.vswitch_cidrs) < 1 ? [] : split(",", join(",", alicloud_vswitch.vswitches.*.id))
+  master_instance_types = var.master_instance_types
+  worker_instance_types = var.worker_instance_types
+  worker_number         = var.k8s_worker_number
+  node_cidr_mask        = var.node_cidr_mask
+  enable_ssh            = var.enable_ssh
+  install_cloud_monitor = var.install_cloud_monitor
+  cpu_policy            = var.cpu_policy
+  proxy_mode            = var.proxy_mode
+  password              = var.password
   pod_cidr              = var.k8s_pod_cidr
   service_cidr          = var.k8s_service_cidr
-  enable_ssh            = true
-  install_cloud_monitor = true
-
+  version               = var.k8s_version
+  dynamic "addons" {
+    for_each = var.cluster_addons
+    content {
+      name   = lookup(addons.value, "name", var.cluster_addons)
+      config = lookup(addons.value, "config", var.cluster_addons)
+    }
+  }
   depends_on = [alicloud_snat_entry.default]
-  master_instance_types = var.master_instance_types
-  worker_instance_types = var.worker_instance_types
-  worker_numbers = var.k8s_worker_numbers
-}
-
+}
diff --git a/variables.tf b/variables.tf
