Modified to use IKS Version Name

Author: 3pings

README.md

@@ -327,7 +327,7 @@ variable "tags" {
 | <a name="input_sysconfig"></a> [sysconfig](#input\_sysconfig) | n/a | <pre>object({<br>    use_existing = bool<br>    name         = string<br>    ntp_servers  = optional(list(string))<br>    dns_servers  = optional(list(string))<br>    timezone     = optional(string)<br>    domain_name  = optional(string)<br>  })</pre> | n/a | yes |
 | <a name="input_tags"></a> [tags](#input\_tags) | n/a | `list(map(string))` | `[]` | no |
 | <a name="input_tr_policy"></a> [tr\_policy](#input\_tr\_policy) | n/a | <pre>object({<br>    use_existing        = bool<br>    create_new          = bool<br>    name                = optional(string)<br>    root_ca_registries  = optional(list(string))<br>    unsigned_registries = optional(list(string))<br>  })</pre> | n/a | yes |
-| <a name="input_version_policy"></a> [version\_policy](#input\_version\_policy) | n/a | <pre>object({<br>    use_existing = bool<br>    name         = string<br>    version      = optional(string)<br>  })</pre> | n/a | yes |
+| <a name="input_versionPolicy"></a> [versionPolicy](#input\_versionPolicy) | n/a | <pre>object({<br>    useExisting = bool<br>    policyName  = string<br>    description = optional(string)<br>    versionName = optional(string)<br>  })</pre> | n/a | yes |
 
 ## Outputs
 

examples/complete_cluster_deployment/README.md

@@ -189,7 +189,7 @@ module "iks_cluster" {
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >=0.14.5 |
-| <a name="requirement_intersight"></a> [intersight](#requirement\_intersight) | =1.0.18 |
+| <a name="requirement_intersight"></a> [intersight](#requirement\_intersight) | =1.0.19 |
 
 ## Providers
 
@@ -199,7 +199,7 @@ No providers.
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_iks_cluster"></a> [iks\_cluster](#module\_iks\_cluster) | terraform-cisco-modules/iks/intersight// | 2.1.0 |
+| <a name="module_iks_cluster"></a> [iks\_cluster](#module\_iks\_cluster) | terraform-cisco-modules/iks/intersight// | 2.1.2 |
 
 ## Resources
 

examples/complete_cluster_deployment/main.tf

@@ -6,14 +6,14 @@ provider "intersight" {
 
 module "iks_cluster" {
   source  = "terraform-cisco-modules/iks/intersight//"
-  version = "2.1.0"
+  version = "2.1.2"
 
   # Kubernetes Cluster Profile  Adjust the values as needed.
   cluster = {
-    name                = "new_cluster"
+    name                = "test"
     action              = "Unassign"
     wait_for_completion = false
-    worker_nodes        = 5
+    worker_nodes        = 2
     load_balancers      = 5
     worker_max          = 20
     control_nodes       = 1
@@ -24,7 +24,7 @@ module "iks_cluster" {
   # IP Pool Information (To create new change "use_existing" to 'false' uncomment variables and modify them to meet your needs.)
   ip_pool = {
     use_existing = true
-    name         = "10-239-21-0"
+    name         = "marvel-prod"
     # ip_starting_address = "10.239.21.220"
     # ip_pool_size        = "20"
     # ip_netmask          = "255.255.255.0"
@@ -53,18 +53,18 @@ module "iks_cluster" {
   }
 
   # Version policy (To create new change "use_existing" to 'false' uncomment variables and modify them to meet your needs.)
-  version_policy = {
-    use_existing = true
-    name         = "1.19.15"
-    # version      = "1.19.15"
+  versionPolicy = {
+    useExisting    = false
+    policyName     = "1.19.15"
+    iksVersionName = "1.19.15-iks.3"
   }
 
   # Trusted Registry Policy (To create new change "use_existing" to 'false' and set "create_new' to 'true' uncomment variables and modify them to meet your needs.)
   # Set both variables to 'false' if this policy is not needed.
   tr_policy = {
     use_existing = false
     create_new   = false
-    name         = "trusted-registry"
+    # name         = "trusted-registry"
   }
 
   # Runtime Policy (To create new change "use_existing" to 'false' and set "create_new' to 'true' uncomment variables and modify them to meet your needs.)
@@ -90,7 +90,7 @@ module "iks_cluster" {
     use_existing = true
     # platformType = "iwe"
     # targetName   = "falcon"
-    policyName = "dev"
+    policyName = "marvel-prod"
     # description  = "Test Policy"
     # interfaces   = ["iwe-guests"]
     # vcTargetName   = optional(string)
@@ -104,14 +104,14 @@ module "iks_cluster" {
   # This is an Optional item.  Comment or remove to not use.  Multiple addons can be configured.
   addons = [
     {
-      createNew       = true
-      addonPolicyName = "smm-tf"
+      createNew       = false
+      addonPolicyName = "smm"
       addonName       = "smm"
-      description     = "SMM Policy"
-      upgradeStrategy = "AlwaysReinstall"
-      installStrategy = "InstallOnly"
-      releaseVersion  = "1.7.4-cisco4-helm3"
-      overrides       = yamlencode({ "demoApplication" : { "enabled" : true } })
+      # description     = "SMM Policy"
+      # upgradeStrategy = "AlwaysReinstall"
+      # installStrategy = "InstallOnly"
+      # releaseVersion  = "1.7.4-cisco4-helm3"
+      overrides = yamlencode({ "demoApplication" : { "enabled" : true } })
     },
     # {
     # createNew = true

examples/complete_cluster_deployment/versions.tf

@@ -4,7 +4,7 @@ terraform {
   required_providers {
     intersight = {
       source  = "CiscoDevNet/intersight"
-      version = "=1.0.18"
+      version = "=1.0.19"
     }
   }
 }

examples/version/README.md

@@ -52,6 +52,7 @@ No providers.
 
 | Name | Source | Version |
 |------|--------|---------|
+| <a name="module_k8s_version_1-19-15-iks3"></a> [k8s\_version\_1-19-15-iks3](#module\_k8s\_version\_1-19-15-iks3) | terraform-cisco-modules/iks/intersight//modules/version | n/a |
 | <a name="module_k8s_version_1-19-5"></a> [k8s\_version\_1-19-5](#module\_k8s\_version\_1-19-5) | terraform-cisco-modules/iks/intersight//modules/version | n/a |
 
 ## Resources

examples/version/main.tf

@@ -5,9 +5,18 @@ provider "intersight" {
 }
 
 module "k8s_version_1-19-5" {
-  source           = "terraform-cisco-modules/iks/intersight//modules/version"
-  k8s_version      = "1.19.5"
-  k8s_version_name = "test_1.19.5"
+  source         = "terraform-cisco-modules/iks/intersight//modules/version"
+  policyName     = "1.19.5"
+  iksVersionName = "1.19.5-iks-0"
+
+  org_name = var.organization
+  tags     = var.tags
+}
+
+module "k8s_version_1-19-15-iks3" {
+  source         = "terraform-cisco-modules/iks/intersight//modules/version"
+  policyName     = "1-19-15-iks.3"
+  iksVersionName = "1.19.15-iks.3"
 
   org_name = var.organization
   tags     = var.tags

main.tf

@@ -25,8 +25,8 @@ data "intersight_kubernetes_container_runtime_policy" "this" {
   name  = var.runtime_policy.name
 }
 data "intersight_kubernetes_version_policy" "this" {
-  count = var.version_policy.use_existing == true ? 1 : 0
-  name  = var.version_policy.name
+  count = var.versionPolicy.useExisting == true ? 1 : 0
+  name  = var.versionPolicy.policyName
 }
 data "intersight_kubernetes_virtual_machine_instance_type" "this" {
   count = var.instance_type.use_existing == true ? 1 : 0
@@ -114,12 +114,13 @@ module "runtime_policy" {
   tags                 = var.tags
 }
 module "k8s_version" {
-  source           = "terraform-cisco-modules/iks/intersight//modules/version"
-  count            = var.version_policy.use_existing == true ? 0 : 1
-  k8s_version      = var.version_policy.version
-  k8s_version_name = var.version_policy.name
-  org_name         = var.organization
-  tags             = var.tags
+  source         = "terraform-cisco-modules/iks/intersight//modules/version"
+  count          = var.versionPolicy.useExisting == true ? 0 : 1
+  iksVersionName = var.versionPolicy.versionName
+  policyName     = var.versionPolicy.policyName
+  description    = var.versionPolicy.description
+  org_name       = var.organization
+  tags           = var.tags
 }
 module "instance_type" {
   source    = "terraform-cisco-modules/iks/intersight//modules/worker_profile"
@@ -142,15 +143,13 @@ module "cluster_profile" {
   ssh_user            = var.cluster.ssh_user
   net_config_moid     = var.k8s_network.use_existing == true ? data.intersight_kubernetes_network_policy.this.0.results.0.moid : module.k8s_network.0.network_policy_moid
   sys_config_moid     = var.sysconfig.use_existing == true ? data.intersight_kubernetes_sys_config_policy.this.0.results.0.moid : module.k8s_sysconfig.0.sys_config_policy_moid
-  # trusted_registry_policy_moid = var.tr_policy.use_existing == true ? data.intersight_kubernetes_trusted_registries_policy.this.0.results.0.moid : module.trusted_registry.0.trusted_registry_moid
   trusted_registry_policy_moid = trimspace(<<-EOT
   %{if var.tr_policy.use_existing == false && var.tr_policy.create_new == false~}%{endif~}
   %{if var.tr_policy.use_existing == true && var.tr_policy.create_new == false~}${data.intersight_kubernetes_trusted_registries_policy.this.0.results.0.moid}%{endif~}
   %{if var.tr_policy.use_existing == true && var.tr_policy.create_new == true~}%{endif~}
   %{if var.tr_policy.use_existing == false && var.tr_policy.create_new == true~}${module.trusted_registry.0.trusted_registry_moid}%{endif~}
   EOT
   )
-  # runtime_policy_moid          = var.runtime_policy.use_existing == true ? data.intersight_kubernetes_container_runtime_policy.this.0.results.0.moid : module.runtime_policy.0.runtime_policy_moid
   runtime_policy_moid = trimspace(<<-EOT
   %{if var.runtime_policy.use_existing == false && var.runtime_policy.create_new == false~}%{endif~}
   %{if var.runtime_policy.use_existing == true && var.runtime_policy.create_new == false~}${data.intersight_kubernetes_container_runtime_policy.this.0.results.0.moid}%{endif~}
@@ -206,7 +205,7 @@ module "control_profile" {
   min_size     = var.cluster.control_nodes
   max_size     = var.cluster.control_nodes + 1
   ip_pool_moid = var.ip_pool.use_existing == true ? data.intersight_ippool_pool.this.0.results.0.moid : module.ip_pool_policy.0.ip_pool_moid
-  version_moid = var.version_policy.use_existing == true ? data.intersight_kubernetes_version_policy.this.0.results.0.moid : module.k8s_version.0.version_policy_moid
+  version_moid = var.versionPolicy.useExisting == true ? data.intersight_kubernetes_version_policy.this.0.results.0.moid : module.k8s_version.0.version_policy_moid
   cluster_moid = module.cluster_profile.k8s_cluster_profile_moid
 
 }
@@ -217,7 +216,7 @@ module "worker_profile" {
   min_size     = var.cluster.worker_nodes
   max_size     = var.cluster.worker_max
   ip_pool_moid = var.ip_pool.use_existing == true ? data.intersight_ippool_pool.this.0.results.0.moid : module.ip_pool_policy.0.ip_pool_moid
-  version_moid = var.version_policy.use_existing == true ? data.intersight_kubernetes_version_policy.this.0.results.0.moid : module.k8s_version.0.version_policy_moid
+  version_moid = var.versionPolicy.useExisting == true ? data.intersight_kubernetes_version_policy.this.0.results.0.moid : module.k8s_version.0.version_policy_moid
   cluster_moid = module.cluster_profile.k8s_cluster_profile_moid
 
 }

modules/version/README.md

@@ -56,9 +56,9 @@ No modules.
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
 | <a name="input_description"></a> [description](#input\_description) | Description to be used to describe the k8s version profile. | `string` | `""` | no |
-| <a name="input_k8s_version"></a> [k8s\_version](#input\_k8s\_version) | Version of the Kubernetes cluster | `string` | n/a | yes |
-| <a name="input_k8s_version_name"></a> [k8s\_version\_name](#input\_k8s\_version\_name) | Name of the policy to be created | `string` | n/a | yes |
+| <a name="input_iksVersionName"></a> [iksVersionName](#input\_iksVersionName) | Version name of IKS | `string` | n/a | yes |
 | <a name="input_org_name"></a> [org\_name](#input\_org\_name) | Intersight Organization name | `string` | n/a | yes |
+| <a name="input_policyName"></a> [policyName](#input\_policyName) | Name of the policy to be created | `string` | n/a | yes |
 | <a name="input_tags"></a> [tags](#input\_tags) | Tags to be associated with this object in Intersight. | `list(map(string))` | `[]` | no |
 
 ## Outputs

modules/version/main.tf

@@ -5,19 +5,16 @@ data "intersight_organization_organization" "this" {
 #Importing the Kubernetes Version available
 data "intersight_kubernetes_version" "this" {
 
-  kubernetes_version = join("", ["v", var.k8s_version])
+  name = var.iksVersionName
 }
 resource "intersight_kubernetes_version_policy" "this" {
 
-  name        = var.k8s_version_name
+  name        = var.policyName
   description = var.description
   nr_version {
-
     object_type = "kubernetes.Version"
     moid        = data.intersight_kubernetes_version.this.results.0.moid
-
   }
-
   dynamic "tags" {
     for_each = var.tags
     content {

modules/version/variables.tf

@@ -2,11 +2,11 @@ variable "org_name" {
   type        = string
   description = "Intersight Organization name"
 }
-variable "k8s_version" {
+variable "iksVersionName" {
   type        = string
-  description = "Version of the Kubernetes cluster"
+  description = "Version name of IKS"
 }
-variable "k8s_version_name" {
+variable "policyName" {
   type        = string
   description = "Name of the policy to be created"
 }