Skip to content

Commit 452fc1a

Browse files
matttrachjiaqiluo
andauthored
fix: PSACT deletion hanging (#1653) (#1672)
Co-authored-by: Jack Luo <jiaqi.luo@suse.com>
1 parent e7ef96a commit 452fc1a

1 file changed

Lines changed: 9 additions & 2 deletions

File tree

rancher2/resource_rancher2_pod_security_admission_configuration_template.go

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,15 @@ func resourceRancher2PodSecurityAdmissionConfigurationTemplateDelete(d *schema.R
147147

148148
// podSecurityAdmissionConfigurationTemplateStateRefreshFunc returns a resource.StateRefreshFunc that is used to watch
149149
// a Rancher PodSecurityAdmissionConfiguration Template
150-
func podSecurityAdmissionConfigurationTemplateStateRefreshFunc(client *managementClient.Client, pspID string) resource.StateRefreshFunc {
150+
func podSecurityAdmissionConfigurationTemplateStateRefreshFunc(client *managementClient.Client, psactID string) resource.StateRefreshFunc {
151151
return func() (interface{}, string, error) {
152-
return nil, "active", nil
152+
obj, err := client.PodSecurityAdmissionConfigurationTemplate.ByID(psactID)
153+
if err != nil {
154+
if IsNotFound(err) || IsForbidden(err) {
155+
return obj, "removed", nil
156+
}
157+
return nil, "", err
158+
}
159+
return obj, "active", nil
153160
}
154161
}

0 commit comments

Comments
 (0)