Skip to content

Commit 45e3ecc

Browse files
Remove missed status check in nodepool (#3374) (#1952)
Signed-off-by: Modular Magician <[email protected]>
1 parent 60816e5 commit 45e3ecc

File tree

2 files changed

+5
-16
lines changed

2 files changed

+5
-16
lines changed

.changelog/3374.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
container: fixed importing/reading `google_container_node_pool` resources in non-RUNNING states
3+
```

google-beta/resource_container_node_pool.go

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -320,27 +320,13 @@ func resourceContainerNodePoolCreate(d *schema.ResourceData, meta interface{}) e
320320
func resourceContainerNodePoolRead(d *schema.ResourceData, meta interface{}) error {
321321
config := meta.(*Config)
322322
nodePoolInfo, err := extractNodePoolInformation(d, config)
323-
324-
name := getNodePoolName(d.Id())
325-
326323
if err != nil {
327324
return err
328325
}
329326

330-
var nodePool = &containerBeta.NodePool{}
331-
err = resource.Retry(2*time.Minute, func() *resource.RetryError {
332-
nodePool, err = config.clientContainerBeta.
333-
Projects.Locations.Clusters.NodePools.Get(nodePoolInfo.fullyQualifiedName(name)).Do()
334-
335-
if err != nil {
336-
return resource.NonRetryableError(err)
337-
}
338-
if nodePool.Status != "RUNNING" {
339-
return resource.RetryableError(fmt.Errorf("Nodepool %q has status %q with message %q", d.Get("name"), nodePool.Status, nodePool.StatusMessage))
340-
}
341-
return nil
342-
})
327+
name := getNodePoolName(d.Id())
343328

329+
nodePool, err := config.clientContainerBeta.Projects.Locations.Clusters.NodePools.Get(nodePoolInfo.fullyQualifiedName(name)).Do()
344330
if err != nil {
345331
return handleNotFoundError(err, d, fmt.Sprintf("NodePool %q from cluster %q", name, nodePoolInfo.cluster))
346332
}

0 commit comments

Comments
 (0)