improve(kubernetes): updated module kubernetes and added example.

Author: Lexsss

examples/basic/main.tf

@@ -0,0 +1,4 @@
+module "kubernetes" {
+  source       = "../../"
+  example_name = "CreateByTerraform"
+}

locals.tf

@@ -0,0 +1,25 @@
+locals {
+  vswitch_name_regex = var.vswitch_name_regex != "" ? var.vswitch_name_regex : var.filter_with_name_regex
+  vswitch_tags       = length(var.vswitch_tags) > 0 ? var.vswitch_tags : var.filter_with_tags
+  vswitch_ids        = length(var.vswitch_ids) > 0 ? var.vswitch_ids : local.vswitch_name_regex != "" || length(local.vswitch_tags) > 0 ? data.alicloud_vswitches.this.ids : []
+  zone_id            = length(var.vswitch_ids) > 0 ? data.alicloud_vswitches.this.vswitches.0.zone_id : data.alicloud_zones.this.ids.0
+}
+
+
+// Instance_types data source for instance_type
+data "alicloud_instance_types" "this" {
+  availability_zone = local.zone_id
+  cpu_core_count    = var.cpu_core_count
+  memory_size       = var.memory_size
+}
+
+// Zones data source for availability_zone
+data "alicloud_zones" "this" {
+  available_resource_creation = "VSwitch"
+}
+
+data "alicloud_vswitches" "this" {
+  ids        = var.vswitch_ids
+  name_regex = local.vswitch_name_regex
+  tags       = local.vswitch_tags
+}

main.tf

@@ -1,71 +1,16 @@
 // Provider specific configs
 provider "alicloud" {
-  version              = ">=1.56.0"
-  region               = var.region != "" ? var.region : null
-  configuration_source = "terraform-alicloud-modules/kubernetes"
-}
-
-// Instance_types data source for instance_type
-data "alicloud_instance_types" "default" {
-  cpu_core_count = var.cpu_core_count
-  memory_size    = var.memory_size
-}
-
-// Zones data source for availability_zone
-data "alicloud_zones" "default" {
-  available_instance_type = data.alicloud_instance_types.default.instance_types[0].id
-}
-
-// If there is not specifying vpc_id, the module will launch a new vpc
-resource "alicloud_vpc" "vpc" {
-  count      = var.vpc_id == "" ? 1 : 0
-  cidr_block = var.vpc_cidr
-  name       = var.vpc_name == "" ? var.example_name : var.vpc_name
-}
-
-// According to the vswitch cidr blocks to launch several vswitches
-resource "alicloud_vswitch" "vswitches" {
-  count             = length(var.vswitch_ids) > 0 ? 0 : length(var.vswitch_cidrs)
-  vpc_id            = var.vpc_id == "" ? join("", alicloud_vpc.vpc.*.id) : var.vpc_id
-  cidr_block        = var.vswitch_cidrs[count.index]
-  availability_zone = data.alicloud_zones.default.zones[count.index % length(data.alicloud_zones.default.zones)]["id"]
-  name = var.vswitch_name_prefix == "" ? format(
-    "%s-%s",
-    var.example_name,
-    format(var.number_format, count.index + 1),
-    ) : format(
-    "%s-%s",
-    var.vswitch_name_prefix,
-    format(var.number_format, count.index + 1),
-  )
-}
-
-resource "alicloud_nat_gateway" "default" {
-  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
-  bandwidth = 10
-}
-
-resource "alicloud_eip_association" "default" {
-  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
-  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
+  version                 = ">=1.56.0"
+  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/kubernetes"
 }
 
 resource "alicloud_cs_kubernetes" "k8s" {
-  count = var.k8s_number
+  availability_zone = var.availability_zone == "" ? data.alicloud_zones.this.zones[0].id : var.availability_zone
+  count             = var.k8s_number
   name = var.k8s_name_prefix == "" ? format(
     "%s-%s",
     var.example_name,
@@ -75,9 +20,8 @@ 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
+  vswitch_ids           = local.vswitch_ids
+  new_nat_gateway       = var.new_nat_gateway
   master_disk_category  = var.master_disk_category
   worker_disk_category  = var.worker_disk_category
   master_disk_size      = var.master_disk_size
@@ -88,9 +32,8 @@ resource "alicloud_cs_kubernetes" "k8s" {
   enable_ssh            = true
   install_cloud_monitor = true
 
-  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
+  worker_numbers        = var.k8s_worker_numbers
 }
 

variables.tf

@@ -6,6 +6,31 @@ variable "region" {
   default     = "cn-beijing"
 }
 
+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."
+  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."
+  default     = ""
+}
+
+variable "skip_region_validation" {
+  description = "Skip static validation of region ID. Used by users of alternative AlibabaCloud-like APIs or users w/ access to regions that are not public (yet)."
+  default     = false
+}
+
+variable "filter_with_name_regex" {
+  description = "A default filter applied to retrieve existing vswitches, nat gateway, eip, snat entry and kubernetes clusters by name regex."
+  default     = ""
+}
+
+variable "filter_with_tags" {
+  description = "A default filter applied to retrieve existing vswitches, nat gateway, eip, snat entry and kubernetes clusters by tags."
+  type        = map(string)
+  default     = {}
+}
+
 variable "availability_zone" {
   description = "The available zone to launch ecs instance and other resources."
   default     = ""
@@ -48,6 +73,18 @@ variable "vpc_cidr" {
 }
 
 # VSwitch variables
+
+variable "vswitch_name_regex" {
+  description = "A default filter applied to retrieve existing vswitches by name regex. If not set, `filter_with_name_regex` will be used."
+  default     = ""
+}
+
+variable "vswitch_tags" {
+  description = "A default filter applied to retrieve existing vswitches by tags. If not set, `filter_with_tags` will be used."
+  type        = map(string)
+  default     = {}
+}
+
 variable "vswitch_name_prefix" {
   description = "The vswitch name prefix used to create several new vswitches. Default to variable `example_name`"
   default     = ""