From 2b8181dcce5ded1996b6d2e92e7b5db79e02b88e Mon Sep 17 00:00:00 2001 From: Kirill Eliseev Date: Mon, 18 Jul 2022 18:53:38 +0200 Subject: [PATCH] Make dns_domain and max_node_unavailable optional (#43) Co-authored-by: Kirill Eliseev --- CHANGELOG.md | 4 ++++ docs/data-sources/vkcs_kubernetes_node_group.md | 2 +- docs/resources/vkcs_kubernetes_node_group.md | 4 ++-- examples/vkcs-kubernetes-cluster-create/main.tf | 1 - examples/vkcs-kubernetes-cluster-create/vars.tf | 4 ---- examples/vkcs-kubernetes-node-group-create/main.tf | 4 +--- examples/vkcs-kubernetes-node-group-create/vars.tf | 14 -------------- vkcs/data_source_vkcs_kubernetes_cluster.go | 2 +- vkcs/data_source_vkcs_kubernetes_node_group.go | 2 +- vkcs/resource_vkcs_kubernetes_cluster.go | 3 ++- vkcs/resource_vkcs_kubernetes_node_group.go | 3 ++- 11 files changed, 14 insertions(+), 29 deletions(-) delete mode 100644 examples/vkcs-kubernetes-cluster-create/vars.tf delete mode 100644 examples/vkcs-kubernetes-node-group-create/vars.tf diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d6839e2..d7e4f13c 100755 --- 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 index 8a456778..41dd22b0 100755 --- 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 index ccc49320..6a82746e 100755 --- 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 index 5158d8ce..68b92d29 100644 --- 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 deleted file mode 100644 index 45a9562b..00000000 --- a/examples/vkcs-kubernetes-cluster-create/vars.tf +++ /dev/null @@ -1,4 +0,0 @@ -variable "dns-domain" { - type = string - default = "cluster.local" -} diff --git a/examples/vkcs-kubernetes-node-group-create/main.tf b/examples/vkcs-kubernetes-node-group-create/main.tf index 109734c7..e88b27b3 100644 --- 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 deleted file mode 100644 index 07f6514c..00000000 --- a/examples/vkcs-kubernetes-node-group-create/vars.tf +++ /dev/null @@ -1,14 +0,0 @@ -variable "name" { - type = string - default = "default" -} - -variable "max-node-unavailable" { - type = number - default = 1 -} - -variable "dns-domain" { - type = string - default = "cluster.local" -} diff --git a/vkcs/data_source_vkcs_kubernetes_cluster.go b/vkcs/data_source_vkcs_kubernetes_cluster.go index c12ded2d..1cf80fbf 100755 --- 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 index a484f0ce..b282850e 100755 --- 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 index 67a016d9..41610810 100755 --- 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 index 71ced173..87204281 100755 --- 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, }, }, }