Skip to content

Commit

Permalink
kubernetes_node_taint: fix warning when node is missing (#2402)
Browse files Browse the repository at this point in the history
  • Loading branch information
partcyborg authored Apr 18, 2024
1 parent f83d63a commit 235a119
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
3 changes: 3 additions & 0 deletions .changelog/2402.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
`resource/kubernetes_node_taint`: Fix the error check for nonexistant nodes so that terraform does not fail if there is a taint in the state file for a node that has been deleted.
```
12 changes: 6 additions & 6 deletions kubernetes/resource_kubernetes_node_taint.go
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,12 @@ func resourceKubernetesNodeTaintRead(ctx context.Context, d *schema.ResourceData
nodeName := meta.Name

conn, err := m.(KubeClientsets).MainClientset()
if err != nil {
return diag.FromErr(err)
}
nodeApi := conn.CoreV1().Nodes()

node, err := nodeApi.Get(ctx, nodeName, metav1.GetOptions{})
if err != nil {
if statusErr, ok := err.(*errors.StatusError); ok && errors.IsNotFound(statusErr) {
// The node is gone so the resource should be deleted.
Expand All @@ -111,12 +117,6 @@ func resourceKubernetesNodeTaintRead(ctx context.Context, d *schema.ResourceData
}
return diag.FromErr(err)
}
nodeApi := conn.CoreV1().Nodes()

node, err := nodeApi.Get(ctx, nodeName, metav1.GetOptions{})
if err != nil {
return diag.FromErr(err)
}
nodeTaints := node.Spec.Taints
if len(nodeTaints) == 0 {
d.SetId("")
Expand Down

0 comments on commit 235a119

Please sign in to comment.