diff --git a/CHANGELOG.md b/CHANGELOG.md index 4005dee..663c575 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/decort/models_api.go b/decort/models_api.go index 5f93b9d..6abe147 100644 --- a/decort/models_api.go +++ b/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 diff --git a/decort/node_subresource.go b/decort/node_subresource.go index 0a079d7..96040c5 100644 --- a/decort/node_subresource.go +++ b/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 diff --git a/decort/resource_k8s.go b/decort/resource_k8s.go index ffea5cf..122a53e 100644 --- a/decort/resource_k8s.go +++ b/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, }, diff --git a/decort/resource_k8s_wg.go b/decort/resource_k8s_wg.go index 24a6c07..4ce3a0d 100644 --- a/decort/resource_k8s_wg.go +++ b/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, },