Merge pull request #82 from 3pings/main

Updated Readmes

Author: 3pings

README.md

@@ -108,11 +108,11 @@ module "terraform-intersight-iks" {
     # service_cidr = "100.64.0.0/24"
     # cni          = "Calico"
   }
-# 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"
+# Version policy (To create new change "useExisting" to 'false' uncomment variables and modify them to meet your needs.)
+  versionPolicy = {
+    useExisting = true
+    policyName     = "1-19-15-iks.3"
+    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.

examples/complete_cluster_deployment/README.md

@@ -47,33 +47,33 @@ 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.
+  # 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
     ssh_user            = var.ssh_user
     ssh_public_key      = var.ssh_key
   }
 
-# IP Pool Information (To create new change "use_existing" to 'false' uncomment variables and modify them to meet your needs.)
+  # 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"
+    use_existing = true
+    name         = "marvel-prod"
     # ip_starting_address = "10.239.21.220"
     # ip_pool_size        = "20"
     # ip_netmask          = "255.255.255.0"
     # ip_gateway          = "10.239.21.1"
     # dns_servers         = ["10.101.128.15","10.101.128.16"]
   }
 
-# Sysconfig Policy (UI Reference NODE OS Configuration) (To create new change "use_existing" to 'false' uncomment variables and modify them to meet your needs.)
+  # Sysconfig Policy (UI Reference NODE OS Configuration) (To create new change "use_existing" to 'false' uncomment variables and modify them to meet your needs.)
   sysconfig = {
     use_existing = true
     name         = "richfield"
@@ -83,7 +83,7 @@ module "iks_cluster" {
     # dns_servers  = ["10.101.128.15"]
   }
 
-# Kubernetes Network CIDR (To create new change "use_existing" to 'false' uncomment variables and modify them to meet your needs.)
+  # Kubernetes Network CIDR (To create new change "use_existing" to 'false' uncomment variables and modify them to meet your needs.)
   k8s_network = {
     use_existing = true
     name         = "default"
@@ -93,23 +93,23 @@ module "iks_cluster" {
     # cni          = "Calico"
   }
 
-# 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"
+  # Version policy (To create new change "use_existing" to 'false' uncomment variables and modify them to meet your needs.)
+  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.
+  # 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.)
-# Set both variables to 'false' if this policy is not needed.
+  # 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.)
+  # Set both variables to 'false' if this policy is not needed.
   runtime_policy = {
     use_existing = false
     create_new   = false
@@ -126,12 +126,12 @@ module "iks_cluster" {
     # https_proxy_password = null
   }
 
-# Infrastructure Configuration Policy (To create new change "use_existing" to 'false' and uncomment variables and modify them to meet your needs.)
+  # Infrastructure Configuration Policy (To create new change "use_existing" to 'false' and uncomment variables and modify them to meet your needs.)
   infraConfigPolicy = {
     use_existing = true
     # platformType = "iwe"
     # targetName   = "falcon"
-    policyName   = "dev"
+    policyName = "marvel-prod"
     # description  = "Test Policy"
     # interfaces   = ["iwe-guests"]
     # vcTargetName   = optional(string)
@@ -141,18 +141,18 @@ module "iks_cluster" {
     # vcPassword      = optional(string)
   }
 
-# Addon Profile and Policies (To create new change "createNew" to 'true' and uncomment variables and modify them to meet your needs.)
-# This is an Optional item.  Comment or remove to not use.  Multiple addons can be configured.
-  addons       = [
+  # Addon Profile and Policies (To create new change "createNew" to 'true' and uncomment variables and modify them to meet your needs.)
+  # This is an Optional item.  Comment or remove to not use.  Multiple addons can be configured.
+  addons = [
     {
-    createNew = true
-    addonPolicyName = "smm-tf"
-    addonName            = "smm"
-    description       = "SMM Policy"
-    upgradeStrategy  = "AlwaysReinstall"
-    installStrategy  = "InstallOnly"
-    releaseVersion = "1.7.4-cisco4-helm3"
-    overrides = yamlencode({"demoApplication":{"enabled":true}})
+      createNew       = false
+      addonPolicyName = "smm"
+      addonName       = "smm"
+      # description     = "SMM Policy"
+      # upgradeStrategy = "AlwaysReinstall"
+      # installStrategy = "InstallOnly"
+      # releaseVersion  = "1.7.4-cisco4-helm3"
+      overrides = yamlencode({ "demoApplication" : { "enabled" : true } })
     },
     # {
     # createNew = true
@@ -165,7 +165,7 @@ module "iks_cluster" {
     # }
   ]
 
-# Worker Node Instance Type (To create new change "use_existing" to 'false' and uncomment variables and modify them to meet your needs.)
+  # Worker Node Instance Type (To create new change "use_existing" to 'false' and uncomment variables and modify them to meet your needs.)
   instance_type = {
     use_existing = true
     name         = "small"
@@ -174,7 +174,7 @@ module "iks_cluster" {
     # disk_size    = 40
   }
 
-# Organization and Tag Information
+  # Organization and Tag Information
   organization = var.organization
   tags         = var.tags
 }

examples/version/README.md

@@ -22,10 +22,10 @@ provider "intersight" {
   endpoint  = var.endpoint
 }
 
-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"
+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