Merge pull request #78 from 3pings/main

Fixed issue #47

Author: 3pings

README.md

@@ -282,7 +282,7 @@ variable "tags" {
 | Name | Source | Version |
 |------|--------|---------|
 | <a name="module_addons"></a> [addons](#module\_addons) | terraform-cisco-modules/iks/intersight//modules/addon_policy | n/a |
-| <a name="module_cluster_addon_profile"></a> [cluster\_addon\_profile](#module\_cluster\_addon\_profile) | ./modules/cluster_addon_profile | n/a |
+| <a name="module_cluster_addon_profile"></a> [cluster\_addon\_profile](#module\_cluster\_addon\_profile) | terraform-cisco-modules/iks/intersight//modules/cluster_addon_profile | n/a |
 | <a name="module_cluster_profile"></a> [cluster\_profile](#module\_cluster\_profile) | terraform-cisco-modules/iks/intersight//modules/cluster | n/a |
 | <a name="module_control_profile"></a> [control\_profile](#module\_control\_profile) | terraform-cisco-modules/iks/intersight//modules/node_profile | n/a |
 | <a name="module_control_provider"></a> [control\_provider](#module\_control\_provider) | terraform-cisco-modules/iks/intersight//modules/infra_provider | n/a |
@@ -334,5 +334,4 @@ variable "tags" {
 | Name | Description |
 |------|-------------|
 | <a name="output_k8s_cluster_moid"></a> [k8s\_cluster\_moid](#output\_k8s\_cluster\_moid) | n/a |
-| <a name="output_k8s_cluster_profile_moid"></a> [k8s\_cluster\_profile\_moid](#output\_k8s\_cluster\_profile\_moid) | n/a |
 <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->

examples/complete_cluster_deployment/output.tf

@@ -1,3 +1,3 @@
 output "cluster_moid" {
-  value = module.iks_cluster.cluster_moid
+  value = module.iks_cluster.k8s_cluster_moid
 }

main.tf

@@ -188,8 +188,7 @@ module "addons" {
 
 module "cluster_addon_profile" {
 
-  # source       = "terraform-cisco-modules/iks/intersight//modules/cluster_addon_profile"
-  source       = "./modules/cluster_addon_profile"
+  source       = "terraform-cisco-modules/iks/intersight//modules/cluster_addon_profile"
   depends_on   = [module.addons]
   count        = var.addons != null ? 1 : 0
   profile_name = "${var.cluster.name}-addon-profile"

modules/cluster/README.md

@@ -67,5 +67,4 @@ No modules.
 | Name | Description |
 |------|-------------|
 | <a name="output_k8s_cluster_moid"></a> [k8s\_cluster\_moid](#output\_k8s\_cluster\_moid) | n/a |
-| <a name="output_k8s_cluster_profile_moid"></a> [k8s\_cluster\_profile\_moid](#output\_k8s\_cluster\_profile\_moid) | n/a |
 <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->

modules/cluster/output.tf

@@ -1,6 +1,3 @@
-output "k8s_cluster_profile_moid" {
-  value = intersight_kubernetes_cluster_profile.this.moid
-}
 output "k8s_cluster_moid" {
   value = intersight_kubernetes_cluster_profile.this.associated_cluster.0.moid
 }

modules/node_profile/README.md

@@ -49,6 +49,7 @@ No modules.
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
+| <a name="input_action"></a> [action](#input\_action) | User Initiated action.  Options are {{Delete\|Deploy\|Ready\|No-op\|Unassign}. | `string` | `"No-op"` | no |
 | <a name="input_cluster_moid"></a> [cluster\_moid](#input\_cluster\_moid) | MOID derived from the Cluster that is being consumed. | `string` | n/a | yes |
 | <a name="input_description"></a> [description](#input\_description) | Descripton of the Node Profile. | `string` | `""` | no |
 | <a name="input_ip_pool_moid"></a> [ip\_pool\_moid](#input\_ip\_pool\_moid) | MOID derived from the IP Pool that is being consumed. | `string` | n/a | yes |

modules/node_profile/main.tf

@@ -1,6 +1,7 @@
 resource "intersight_kubernetes_node_group_profile" "this" {
 
   name        = var.name
+  action      = var.action
   description = var.description
   node_type   = var.profile_type
   minsize     = var.min_size

modules/node_profile/variables.tf

@@ -7,7 +7,11 @@ variable "description" {
   description = "Descripton of the Node Profile."
   default     = ""
 }
-
+variable "action" {
+  default     = "No-op"
+  description = "User Initiated action.  Options are {{Delete|Deploy|Ready|No-op|Unassign}."
+  type        = string
+}
 variable "profile_type" {
   type        = string
   description = "Type of profile to be created. i.e Master or Worker"

output.tf

@@ -1,7 +1,3 @@
-output "k8s_cluster_profile_moid" {
-  value = module.cluster_profile.k8s_cluster_profile_moid
-}
-
 output "k8s_cluster_moid" {
   value = module.cluster_profile.k8s_cluster_moid
 }