Improves the module example

Author: susu9527

CHANGELOG.md

@@ -1,4 +1,10 @@
-## 1.6.0 (Unreleased)
+## 1.7.0 (Unreleased)
+## 1.6.0 (July 25, 2023)
+
+IMPROVEMENTS:
+
+- Improves the module example [GH-18](https://github.com/terraform-alicloud-modules/terraform-alicloud-managed-kubernetes/pull/18)
+
 ## 1.5.0 (November 15, 2021)
 
 IMPROVEMENTS:

README.md

@@ -28,6 +28,7 @@ module "managed-k8s" {
   source             = "terraform-alicloud-modules/managed-kubernetes/alicloud"
   
   k8s_name_prefix = "my-managed-k8s-with-new-vpc"
+  cluster_spec    = "ack.pro.small"
   new_vpc         = true
   vpc_cidr        = "192.168.0.0/16"
   vswitch_cidrs   = [
@@ -47,6 +48,7 @@ module "managed-k8s" {
   source             = "terraform-alicloud-modules/managed-kubernetes/alicloud"
   
   k8s_name_prefix = "my-managed-k8s-with-new-vpc"
+  cluster_spec    = "ack.pro.small"
   new_vpc         = false
   vswitch_ids     = [
     "vsw-12345678",

examples/basic/main.tf

@@ -0,0 +1,47 @@
+data "alicloud_zones" "default" {
+  available_resource_creation = "VSwitch"
+}
+
+resource "alicloud_vpc" "default" {
+  vpc_name   = "tf-example"
+  cidr_block = "10.4.0.0/16"
+}
+
+resource "alicloud_vswitch" "default" {
+  vswitch_name = "tf-example"
+  cidr_block   = "10.4.0.0/24"
+  vpc_id       = alicloud_vpc.default.id
+  zone_id      = data.alicloud_zones.default.zones.0.id
+}
+
+module "managed-k8s" {
+  source             = "../../"
+  k8s_name_prefix    = "tf-example"
+  cluster_spec       = "ack.pro.small"
+  vswitch_ids        = [alicloud_vswitch.default.id]
+  k8s_pod_cidr       = cidrsubnet("10.0.0.0/8", 8, 36)
+  k8s_service_cidr   = cidrsubnet("172.16.0.0/16", 4, 7)
+  kubernetes_version = "1.24.6-aliyun.1"
+  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\"}",
+    },
+  ]
+}

examples/basic/README.md renamed to examples/complete/README.md

@@ -7,18 +7,10 @@ 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 "this_k8s_node_ids" {
-  description = "List ids of of cluster node."
-  value       = module.managed-k8s.this_k8s_node_ids
-}
-// Output VPC
-output "this_vpc_id" {
-  description = "The ID of the VPC."
-  value       = module.managed-k8s.this_vpc_id
+
+output "this_k8s_node_pool_id" {
+  description = "ID of the kunernetes node pool."
+  value       = module.managed-k8s.this_k8s_node_pool_id
 }
 
 output "this_vswitch_ids" {
@@ -29,3 +21,4 @@ output "this_security_group_id" {
   description = "ID of the Security Group used to deploy kubernetes cluster."
   value       = module.managed-k8s.this_security_group_id
 }
+

examples/complete/main.tf

@@ -1,28 +1,32 @@
 resource "alicloud_cs_managed_kubernetes" "this" {
-  count                 = length(local.vswitch_ids) > 0 ? 1 : 0
-  name                  = local.k8s_name
-  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
-  version               = var.kubernetes_version
-  worker_instance_types = var.worker_instance_types
-  worker_number         = var.worker_number
+  count                = length(local.vswitch_ids) > 0 ? 1 : 0
+  name                 = local.k8s_name
+  cluster_spec         = var.cluster_spec
+  worker_vswitch_ids   = local.vswitch_ids
+  new_nat_gateway      = var.new_vpc == true ? false : var.new_nat_gateway
+  pod_cidr             = var.k8s_pod_cidr
+  service_cidr         = var.k8s_service_cidr
+  slb_internet_enabled = true
+  version              = var.kubernetes_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)
     }
   }
-  kube_config     = var.kube_config_path
   client_cert     = var.client_cert_path
   client_key      = var.client_key_path
   cluster_ca_cert = var.cluster_ca_cert_path
+}
 
-  depends_on = [alicloud_snat_entry.new]
+resource "alicloud_cs_kubernetes_node_pool" "this" {
+  count                = length(local.vswitch_ids) > 0 ? 1 : 0
+  name                 = local.k8s_name
+  cluster_id           = alicloud_cs_managed_kubernetes.this.0.id
+  vswitch_ids          = local.vswitch_ids
+  instance_types       = var.worker_instance_types
+  system_disk_category = var.worker_disk_category
+  system_disk_size     = var.worker_disk_size
+  desired_size         = var.worker_number
 }

examples/basic/outputs.tf renamed to examples/complete/outputs.tf

@@ -7,20 +7,12 @@ output "this_k8s_id" {
   description = "ID of the kunernetes cluster."
   value       = concat(alicloud_cs_managed_kubernetes.this.*.id, [""])[0]
 }
-output "this_k8s_nodes" {
-  description = "List nodes of cluster."
-  value       = concat(alicloud_cs_managed_kubernetes.this.*.worker_nodes, [""])[0]
-}
-output "this_k8s_node_ids" {
-  description = "List ids of of cluster node."
-  value       = [for _, obj in concat(alicloud_cs_managed_kubernetes.this.*.worker_nodes, [{}])[0] : lookup(obj,"id")]
+
+output "this_k8s_node_pool_id" {
+  description = "ID of the kunernetes node pool."
+  value       = concat(alicloud_cs_kubernetes_node_pool.this.*.id, [""])[0]
 }
 // Output VPC
-output "this_vpc_id" {
-  description = "The ID of the VPC."
-  value       = concat(alicloud_cs_managed_kubernetes.this.*.vpc_id, [""])[0]
-}
-
 output "this_vswitch_ids" {
   description = "List ID of the VSwitches."
   value       = local.vswitch_ids

main.tf

@@ -64,7 +64,13 @@ variable "new_nat_gateway" {
   type        = bool
   default     = false
 }
-# Cluster nodes variables
+# Cluster variables
+variable "cluster_spec" {
+  description = "The cluster specifications of kubernetes cluster. Valid values: ack.standard | ack.pro.small "
+  type        = string
+  default     = ""
+}
+
 variable "cpu_core_count" {
   description = "CPU core count is used to fetch instance types."
   type        = number
@@ -83,12 +89,6 @@ variable "kubernetes_version" {
   default     = ""
 }
 
-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({
@@ -98,30 +98,6 @@ variable "cluster_addons" {
   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
@@ -140,28 +116,6 @@ variable "k8s_service_cidr" {
   default     = "172.21.0.0/20"
 }
 
-variable "cluster_network_type" {
-  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 = "(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 = "(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
@@ -176,4 +130,29 @@ variable "cluster_ca_cert_path" {
   description = "The path of cluster ca certificate, like ~/.kube/cluster-ca-cert.pem"
   type        = string
   default     = ""
+}
+
+# Cluster nodes variables
+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.c7.xlarge"]
+}
+
+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 "worker_number" {
+  description = "The number of kubernetes cluster work nodes."
+  type        = number
+  default     = 2
 }