Skip to content

Commit 01840be

Browse files
authored
Add rule number to the terraform state (#245)
* Add rule number to the terraform state * handle force replacement of existing acl rules in case of migration from ports to port * fix order of rules * Fix state values set for cks cluster to prevent unnecessary cluster replacement
1 parent f0615b8 commit 01840be

File tree

2 files changed

+423
-73
lines changed

2 files changed

+423
-73
lines changed

cloudstack/resource_cloudstack_kubernetes_cluster.go

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -393,14 +393,21 @@ func resourceCloudStackKubernetesClusterRead(d *schema.ResourceData, meta interf
393393
d.Set("control_nodes_size", cluster.Controlnodes)
394394
d.Set("size", cluster.Size)
395395
d.Set("autoscaling_enabled", cluster.Autoscalingenabled)
396-
d.Set("min_size", cluster.Minsize)
397-
d.Set("max_size", cluster.Maxsize)
396+
if cluster.Autoscalingenabled {
397+
d.Set("min_size", cluster.Minsize)
398+
d.Set("max_size", cluster.Maxsize)
399+
}
398400
d.Set("keypair", cluster.Keypair)
399401
d.Set("network_id", cluster.Networkid)
400402
d.Set("ip_address", cluster.Ipaddress)
401403
d.Set("state", cluster.State)
402-
d.Set("account", cluster.Account)
403-
d.Set("domain_id", cluster.Domainid)
404+
if _, ok := d.GetOk("account"); ok {
405+
d.Set("account", cluster.Account)
406+
}
407+
if _, ok := d.GetOk("domain_id"); ok {
408+
d.Set("domain_id", cluster.Domainid)
409+
}
410+
404411
d.Set("etcd_nodes_size", cluster.Etcdnodes)
405412
d.Set("cni_configuration_id", cluster.Cniconfigurationid)
406413

0 commit comments

Comments
 (0)