improve(managed-k8s): improve the module to adapt new version resources

Lexsss · xiaozhu36 · commit ad580666f7cc · 2020-04-08T17:16:04.000+08:00
diff --git a/README.md b/README.md
@@ -64,16 +64,31 @@ In other words, the specified vpc has a nat gateway and there are several snat e
 
 This moudle can set [sls project](https://www.terraform.io/docs/providers/alicloud/r/log_project.html) config for this module
 
-1. Create a new sls project with `new_sls_project`:  
+1. Create a new sls project with `cluster_addons`:  
 
     ```hcl
-    new_sls_project = true
-    ```
-
-1. Using existing sls project with `sls_project_name`:  
-
-    ```hcl
-    sls_project_name = "Your-sls-project-name"
+     cluster_addons = [
+       {
+         name   = "flannel",
+         config = "",
+       },
+       {
+         name   = "flexvolume",
+         config = "",
+       },
+       {
+         name   = "alicloud-disk-controller",
+         config = "",
+       },
+       {
+         name   = "logtail-ds",
+         config = "{\"IngressDashboardEnabled\":\"true\"}",
+       },
+       {
+         name   = "nginx-ingress-controller",
+         config = "{\"IngressSlbNetworkType\":\"internet\"}",
+       },
+     ]
     ```
 
 If you want to store kube config and other certificates after the cluster created, you can set the following parameters: 
@@ -139,7 +154,7 @@ If you want to store kube config and other certificates after the cluster create
 
 Terraform version
 -----------------
-Terraform version 0.12.0 or newer and Provider version 1.57.2 or newer are required for this example to work.
+Terraform version 0.12.0 or newer and Provider version 1.77.0 or newer are required for this example to work.
 
 Authors
 -------
diff --git a/examples/basic/README.md b/examples/basic/README.md
@@ -0,0 +1,15 @@
+# Managed kubernetes create with kubernetes networking module example
+
+Configuration in this directory creates set of kubernetes cluster in various combinations.
+
+## Usage
+
+To run this example you need to execute:
+
+```bash
+$ terraform init
+$ terraform plan
+$ terraform apply
+```
+
+Note that this example may create resources which cost money. Run `terraform destroy` when you don't need these resources.
diff --git a/examples/basic/main.tf b/examples/basic/main.tf
@@ -0,0 +1,65 @@
+variable "profile" {
+  default = "default"
+}
+variable "region" {
+  default = "cn-zhangjiakou"
+}
+variable "zone_id" {
+  default = "cn-zhangjiakou-a"
+}
+variable "vpc_cidr" {
+  default = "10.1.0.0/21"
+}
+variable "availability_zones" {
+  default = ["cn-zhangjiakou-a", "cn-zhangjiakou-b", "cn-zhangjiakou-c"]
+}
+
+provider "alicloud" {
+  region  = var.region
+  profile = var.profile
+}
+
+###########################################
+# Data sources to get VPC, vswitch details
+###########################################
+
+module "managed-k8s" {
+  source          = "../../"
+  region          = var.region
+  profile         = var.profile
+  k8s_name_prefix = "CreateByTerraform1"
+
+  vswitch_ids = [concat(module.kubernetes-networking.this_vswitch_ids, [""])[0]]
+  cluster_addons = [
+    {
+      name   = "flannel",
+      config = "",
+    },
+    {
+      name   = "flexvolume",
+      config = "",
+    },
+    {
+      name   = "alicloud-disk-controller",
+      config = "",
+    },
+    {
+      name   = "logtail-ds",
+      config = "{\"IngressDashboardEnabled\":\"true\"}",
+    },
+    {
+      name   = "nginx-ingress-controller",
+      config = "{\"IngressSlbNetworkType\":\"internet\"}",
+    },
+  ]
+}
+
+module "kubernetes-networking" {
+  source             = "terraform-alicloud-modules/kubernetes-networking/alicloud"
+  region             = var.region
+  profile            = var.profile
+  vpc_cidr           = var.vpc_cidr
+  availability_zones = var.availability_zones
+  vswitch_cidrs      = [cidrsubnet(var.vpc_cidr, 4, 6)]
+  create             = true
+}
diff --git a/examples/basic/outputs.tf b/examples/basic/outputs.tf
@@ -0,0 +1,27 @@
+// Output kubernetes resource
+output "this_k8s_name" {
+  description = "Name of the kunernetes cluster."
+  value       = module.managed-k8s.this_k8s_name
+}
+output "this_k8s_id" {
+  description = "ID of the kunernetes cluster."
+  value       = module.managed-k8s.this_k8s_id
+}
+output "this_k8s_nodes" {
+  description = "List nodes of cluster."
+  value       = module.managed-k8s.this_k8s_nodes
+}
+// Output VPC
+output "this_vpc_id" {
+  description = "The ID of the VPC."
+  value       = module.managed-k8s.this_vpc_id
+}
+
+output "this_vswitch_ids" {
+  description = "List ID of the VSwitches."
+  value       = module.managed-k8s.this_vswitch_ids
+}
+output "this_security_group_id" {
+  description = "ID of the Security Group used to deploy kubernetes cluster."
+  value       = module.managed-k8s.this_security_group_id
+}
diff --git a/locals.tf b/locals.tf
@@ -6,9 +6,7 @@ locals {
     For     = "modules/terraform-alicloud-managed-kubernetes"
     K8s     = local.k8s_name
   }
-  vswitch_ids    = length(var.vswitch_ids) > 0 ? var.vswitch_ids : alicloud_vswitch.new.*.id
-  sls_project    = var.sls_project_name == "" ? concat(alicloud_log_project.new.*.id, [""])[0] : var.sls_project_name
-  instance_types = length(var.worker_instance_types) > 0 ? var.worker_instance_types : [data.alicloud_instance_types.default.ids.0]
+  vswitch_ids = length(var.vswitch_ids) > 0 ? var.vswitch_ids : alicloud_vswitch.new.*.id
 }
 
 resource "random_uuid" "this" {}
diff --git a/main.tf b/main.tf
@@ -1,37 +1,31 @@
 // Provider specific configs
 provider "alicloud" {
-  version                 = ">=1.57.2"
   profile                 = var.profile != "" ? var.profile : null
   shared_credentials_file = var.shared_credentials_file != "" ? var.shared_credentials_file : null
   region                  = var.region != "" ? var.region : null
   skip_region_validation  = var.skip_region_validation
   configuration_source    = "terraform-alicloud-modules/managed-kubernetes"
 }
 
-resource "alicloud_log_project" "new" {
-  count = var.new_sls_project == true ? 1 : 0
-  // sls project name must end with lower letter
-  name        = format("%s-end", substr("for-${local.k8s_name}", 0, 59))
-  description = "created by terraform for managedkubernetes cluster"
-}
-
 resource "alicloud_cs_managed_kubernetes" "this" {
   count                 = length(local.vswitch_ids) > 0 ? 1 : 0
   name                  = local.k8s_name
-  vswitch_ids           = local.vswitch_ids
+  worker_vswitch_ids    = local.vswitch_ids
   new_nat_gateway       = var.new_vpc == true ? false : var.new_nat_gateway
   worker_disk_category  = var.worker_disk_category
   password              = var.ecs_password
   pod_cidr              = var.k8s_pod_cidr
   service_cidr          = var.k8s_service_cidr
   slb_internet_enabled  = true
   install_cloud_monitor = true
-  cluster_network_type  = var.cluster_network_type
   worker_instance_types = var.worker_instance_types
   worker_number         = var.worker_number
-  log_config {
-    type    = "SLS"
-    project = local.sls_project == "" ? null : local.sls_project
+  dynamic "addons" {
+    for_each = var.cluster_addons
+    content {
+      name   = lookup(addons.value, "name", var.cluster_addons)
+      config = lookup(addons.value, "config", var.cluster_addons)
+    }
   }
   kube_config     = var.kube_config_path
   client_cert     = var.client_cert_path
diff --git a/outputs.tf b/outputs.tf
@@ -25,9 +25,3 @@ output "this_security_group_id" {
   description = "ID of the Security Group used to deploy kubernetes cluster."
   value       = concat(alicloud_cs_managed_kubernetes.this.*.security_group_id, [""])[0]
 }
-
-//Output SLS
-output "this_sls_project_name" {
-  description = "The sls project name used to configure cluster."
-  value       = local.sls_project
-}
diff --git a/variables.tf b/variables.tf
@@ -1,15 +1,18 @@
 //Autoscaling group
 variable "region" {
   description = "The region ID used to launch this module resources. If not set, it will be sourced from followed by ALICLOUD_REGION environment variable and profile."
+  type        = string
   default     = ""
 }
 
 variable "profile" {
   description = "The profile name as set in the shared credentials file. If not set, it will be sourced from the ALICLOUD_PROFILE environment variable."
+  type        = string
   default     = ""
 }
 variable "shared_credentials_file" {
   description = "This is the path to the shared credentials file. If this is not set and a profile is specified, $HOME/.aliyun/config.json will be used."
+  type        = string
   default     = ""
 }
 
@@ -28,6 +31,7 @@ variable "new_vpc" {
 
 variable "vpc_cidr" {
   description = "The cidr block used to launch a new vpc."
+  type        = string
   default     = "192.168.0.0/16"
 }
 
@@ -52,6 +56,7 @@ variable "availability_zones" {
 
 variable "new_eip_bandwidth" {
   description = "The bandwidth used to create a new EIP when 'new_vpc' is true."
+  type        = number
   default     = 50
 }
 variable "new_nat_gateway" {
@@ -62,82 +67,107 @@ variable "new_nat_gateway" {
 # Cluster nodes variables
 variable "cpu_core_count" {
   description = "CPU core count is used to fetch instance types."
+  type        = number
   default     = 1
 }
 
 variable "memory_size" {
   description = "Memory size used to fetch instance types."
+  type        = number
   default     = 2
 }
+
 variable "worker_instance_types" {
   description = "The ecs instance type used to launch worker nodes. If not set, data source `alicloud_instance_types` will return one based on `cpu_core_count` and `memory_size`."
   type        = list(string)
   default     = ["ecs.n4.xlarge"]
 }
 
+variable "cluster_addons" {
+  description = "Addon components in kubernetes cluster"
+  type = list(object({
+    name   = string
+    config = string
+  }))
+  default = []
+}
+
 variable "worker_disk_category" {
   description = "The system disk category used to launch one or more worker nodes."
+  type        = string
   default     = "cloud_efficiency"
 }
 
 variable "worker_disk_size" {
   description = "The system disk size used to launch one or more worker nodes."
+  type        = number
   default     = 40
 }
 
 variable "ecs_password" {
   description = "The password of worker nodes."
+  type        = string
   default     = "Abc12345"
 }
 
 variable "worker_number" {
   description = "The number of kubernetes cluster work nodes."
+  type        = number
   default     = 2
 }
 
 variable "k8s_name_prefix" {
   description = "The name prefix used to create managed kubernetes cluster."
+  type        = string
   default     = "terraform-alicloud-managed-kubernetes"
 }
 
 variable "k8s_pod_cidr" {
   description = "The kubernetes pod cidr block. It cannot be equals to vpc's or vswitch's and cannot be in them. If vpc's cidr block is `172.16.XX.XX/XX`, it had better to `192.168.XX.XX/XX` or `10.XX.XX.XX/XX`."
+  type        = string
   default     = "172.20.0.0/16"
 }
 
 variable "k8s_service_cidr" {
   description = "The kubernetes service cidr block. It cannot be equals to vpc's or vswitch's or pod's and cannot be in them. Its setting rule is same as `k8s_pod_cidr`."
+  type        = string
   default     = "172.21.0.0/20"
 }
 
 variable "cluster_network_type" {
-  description = "Network type, valid options are `flannel` and `terway`."
+  description = "(Deprecated from v1.3.0, use 'cluster_addons' instead)Network type, valid options are `flannel` and `terway`."
+  type        = string
   default     = "flannel"
 }
 
 variable "new_sls_project" {
-  description = "Create a new sls project for this module."
+  description = "(Deprecated from v1.3.0, use 'cluster_addons' instead)Create a new sls project for this module."
   type        = bool
   default     = false
 }
 variable "sls_project_name" {
-  description = "Specify a existing sls project for this module."
+  description = "(Deprecated from v1.3.0, use 'cluster_addons' instead)Specify a existing sls project for this module."
+  type        = string
   default     = ""
 }
 
 variable "kube_config_path" {
   description = "The path of kube config, like ~/.kube/config"
+  type        = string
   default     = ""
 }
 variable "client_cert_path" {
   description = "The path of client certificate, like ~/.kube/client-cert.pem"
+  type        = string
   default     = ""
 }
 variable "client_key_path" {
   description = "The path of client key, like ~/.kube/client-key.pem"
+  type        = string
   default     = ""
 }
 variable "cluster_ca_cert_path" {
   description = "The path of cluster ca certificate, like ~/.kube/cluster-ca-cert.pem"
+  type        = string
   default     = ""
 }

Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,7 @@ locals {`
`6`	`6`	`For = "modules/terraform-alicloud-managed-kubernetes"`
`7`	`7`	`K8s = local.k8s_name`
`8`	`8`	`}`
`9`		`- vswitch_ids = length(var.vswitch_ids) > 0 ? var.vswitch_ids : alicloud_vswitch.new.*.id`
`10`		`- sls_project = var.sls_project_name == "" ? concat(alicloud_log_project.new.*.id, [""])[0] : var.sls_project_name`
`11`		`- instance_types = length(var.worker_instance_types) > 0 ? var.worker_instance_types : [data.alicloud_instance_types.default.ids.0]`
	`9`	`+ vswitch_ids = length(var.vswitch_ids) > 0 ? var.vswitch_ids : alicloud_vswitch.new.*.id`
`12`	`10`	`}`
`13`	`11`
`14`	`12`	`resource "random_uuid" "this" {}`