k8s: fixed state import; k8s, k8s_wg: increased create/update timeouts

CHANGELOG.md

@@ -1,16 +1,5 @@
-## 2.0
+### Bug fixes
+- k8s state import
 
-### New data sources
-- image
-- image\_list
-- grid
-- grid\_list
-- image\_list\_stacks
-
-### New resources
-- image
-- virtual\_image
-- cdrom\_image
-- delete\_images
-- k8s
-- k8s\_wg
+### Minor changes
+- increased k8s and k8s\_wg create/update timeouts

decort/models_api.go

@@ -36,7 +36,7 @@ import (
 var Timeout30s = time.Second * 30
 var Timeout60s = time.Second * 60
 var Timeout180s = time.Second * 180
-var Timeout10m = time.Minute * 10
+var Timeout20m = time.Minute * 20
 
 //
 // structures related to /cloudapi/rg/list API

decort/node_subresource.go

@@ -58,7 +58,6 @@ func parseNode(nodeList []interface{}) K8sNodeRecord {
 func nodeToResource(node K8sNodeRecord) []interface{} {
 	mp := make(map[string]interface{})
 
-	mp["id"] = node.ID
 	mp["num"] = node.Num
 	mp["cpu"] = node.Cpu
 	mp["ram"] = node.Ram

decort/resource_k8s.go

@@ -346,9 +346,9 @@ func resourceK8s() *schema.Resource {
 		},
 
 		Timeouts: &schema.ResourceTimeout{
-			Create:  &Timeout10m,
+			Create:  &Timeout20m,
 			Read:    &Timeout30s,
-			Update:  &Timeout10m,
+			Update:  &Timeout20m,
 			Delete:  &Timeout60s,
 			Default: &Timeout60s,
 		},

decort/resource_k8s_wg.go

@@ -238,9 +238,9 @@ func resourceK8sWg() *schema.Resource {
 		},
 
 		Timeouts: &schema.ResourceTimeout{
-			Create:  &Timeout10m,
+			Create:  &Timeout20m,
 			Read:    &Timeout30s,
-			Update:  &Timeout10m,
+			Update:  &Timeout20m,
 			Delete:  &Timeout60s,
 			Default: &Timeout60s,
 		},