Make dns_domain and max_node_unavailable optional (#43)

Co-authored-by: Kirill Eliseev <[email protected]>
vk-cs · Jul 18, 2022 · 2b8181d · 2b8181d
1 parent 27227de
commit 2b8181d
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 29 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ description: |-
 
 # VKCS Provider's changelog
 
+#### v0.1.10
+- Minor updates for resource_vkcs_kubernetes_cluster, resource_vkcs_kubernetes_node_group,
+- data_source_vkcs_kubernetes_cluster and examples
+
 #### v0.1.9
 - Fix re-creation of db user after re-creation of db instance 
 

diff --git a/docs/data-sources/vkcs_kubernetes_node_group.md b/docs/data-sources/vkcs_kubernetes_node_group.md
@@ -40,4 +40,4 @@ attributes are exported:
 * `uuid` - The UUID of the cluster's node group.
 * `volume_size` - The amount of memory of volume in Gb.
 * `volume_type` - The type of volume.
-* `max_node_unavailable` - Specified as a percentage. The maximum number of nodes that can fail during an upgrade. **New since version v0.1.3**.
+* `max_node_unavailable` - Specified as a percentage. The maximum number of nodes that can fail during an upgrade.
diff --git a/docs/resources/vkcs_kubernetes_node_group.md b/docs/resources/vkcs_kubernetes_node_group.md
@@ -45,7 +45,7 @@ The following arguments are supported:
  Changing this will force to create a new node group.
 * `volume_type` - (Optional) The volume type to load nodes from.
  Changing this will force to create a new node group.
-* `max_node_unavailable` - (Optional) The maximum number of nodes that can fail during an upgrade. The default value is 25 percent.  **New since version v0.1.3**.
+* `max_node_unavailable` - (Optional) The maximum number of nodes that can fail during an upgrade. The default value is 25 percent.
 
 
 ## Attributes
@@ -68,7 +68,7 @@ attributes are exported:
 * `uuid` - The UUID of the cluster's node group.
 * `volume_size` - The size in GB for volume to load nodes from.
 * `volume_type` - The volume type to load nodes from.
-* `max_node_unavailable` - (Optional) The maximum number of nodes that can fail during an upgrade.  **New since version v0.1.3**.
+* `max_node_unavailable` - The maximum number of nodes that can fail during an upgrade.
 
 ## Import
 

diff --git a/examples/vkcs-kubernetes-cluster-create/main.tf b/examples/vkcs-kubernetes-cluster-create/main.tf
@@ -17,5 +17,4 @@ resource "vkcs_kubernetes_cluster" "k8s-cluster" {
   floating_ip_enabled = true
   availability_zone   = "MS1"
   insecure_registries = ["1.2.3.4"]
-  dns_domain          = var.dns-domain
 }
diff --git a/examples/vkcs-kubernetes-cluster-create/vars.tf b/examples/vkcs-kubernetes-cluster-create/vars.tf
diff --git a/examples/vkcs-kubernetes-node-group-create/main.tf b/examples/vkcs-kubernetes-node-group-create/main.tf
@@ -17,17 +17,15 @@ resource "vkcs_kubernetes_cluster" "k8s-cluster" {
     floating_ip_enabled = true
     availability_zone   = "MS1"
     insecure_registries = ["1.2.3.4"]
-    dns_domain          = var.dns-domain
 }
 
 resource "vkcs_kubernetes_node_group" "default_ng" {
     cluster_id = vkcs_kubernetes_cluster.k8s-cluster.id
 
     node_count = 1
-    name = var.name
+    name = "default"
     max_nodes = 5
     min_nodes = 1
-    max_node_unavailable = var.max-node-unavailable
 
     labels {
         key = "env"

diff --git a/examples/vkcs-kubernetes-node-group-create/vars.tf b/examples/vkcs-kubernetes-node-group-create/vars.tf
diff --git a/vkcs/data_source_vkcs_kubernetes_cluster.go b/vkcs/data_source_vkcs_kubernetes_cluster.go
@@ -139,7 +139,7 @@ func dataSourceKubernetesCluster() *schema.Resource {
 			"dns_domain": {
 				Type:     schema.TypeString,
 				Optional: true,
-				Computed: false,
+				Computed: true,
 			},
 		},
 	}

diff --git a/vkcs/data_source_vkcs_kubernetes_node_group.go b/vkcs/data_source_vkcs_kubernetes_node_group.go
@@ -100,7 +100,7 @@ func dataSourceKubernetesNodeGroup() *schema.Resource {
 			"max_node_unavailable": {
 				Type:     schema.TypeInt,
 				Optional: true,
-				Computed: false,
+				Computed: true,
 			},
 		},
 	}

diff --git a/vkcs/resource_vkcs_kubernetes_cluster.go b/vkcs/resource_vkcs_kubernetes_cluster.go
@@ -211,8 +211,9 @@ func resourceKubernetesCluster() *schema.Resource {
 			},
 			"dns_domain": {
 				Type:     schema.TypeString,
-				Required: true,
+				Optional: true,
 				ForceNew: true,
+				Computed: true,
 			},
 		},
 	}

diff --git a/vkcs/resource_vkcs_kubernetes_node_group.go b/vkcs/resource_vkcs_kubernetes_node_group.go
@@ -153,7 +153,8 @@ func resourceKubernetesNodeGroup() *schema.Resource {
 			},
 			"max_node_unavailable": {
 				Type:     schema.TypeInt,
-				Required: true,
+				Optional: true,
+				Computed: true,
 			},
 		},
 	}