Skip to content

kubernetes_node_taint: fix warning when node is missing #2402

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 18, 2024
Merged

kubernetes_node_taint: fix warning when node is missing #2402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f3b93f
kubernetes_node_taint: fix warning when node is missing
partcyborg Jan 13, 2024
4f6e336
add changelog note
partcyborg Feb 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/2402.txt
View file
Open in desktop
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
View file
Open in desktop
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