Add containerinfra cluster zero node count support

Signed-off-by: Arthur Outhenin-Chalandre <arthur.outhenin-chalandre@cern.ch>
terraform-provider-openstack · Apr 9, 2022 · d2639a4 · d2639a4
1 parent 800e358
commit d2639a4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/openstack/containerinfra_shared_v1.go b/openstack/containerinfra_shared_v1.go
@@ -26,7 +26,8 @@ const (
 	rsaPrivateKeyBlockType      = "RSA PRIVATE KEY"
 	certificateRequestBlockType = "CERTIFICATE REQUEST"
 
-	containerInfraV1NodeGroupMinMicroversion = "1.9"
+	containerInfraV1NodeGroupMinMicroversion  = "1.9"
+	containerInfraV1ZeroNodeCountMicroversion = "1.10"
 )
 
 func expandContainerInfraV1LabelsMap(v map[string]interface{}) (map[string]string, error) {

diff --git a/openstack/resource_openstack_containerinfra_cluster_v1.go b/openstack/resource_openstack_containerinfra_cluster_v1.go
@@ -160,7 +160,7 @@ func resourceContainerInfraClusterV1() *schema.Resource {
 				Type:     schema.TypeInt,
 				Optional: true,
 				ForceNew: false,
-				Computed: true,
+				Default:  1,
 			},
 
 			"master_addresses": {
@@ -274,8 +274,11 @@ func resourceContainerInfraClusterV1Create(ctx context.Context, d *schema.Resour
 	}
 
 	nodeCount := d.Get("node_count").(int)
-	if nodeCount > 0 {
+	if nodeCount >= 0 {
 		createOpts.NodeCount = &nodeCount
+		if nodeCount == 0 {
+			containerInfraClient.Microversion = containerInfraV1ZeroNodeCountMicroversion
+		}
 	}
 
 	mergeLabels := d.Get("merge_labels").(bool)