Skip to content

Commit

Permalink
k8s resource delete bugfix (#809)
Browse files Browse the repository at this point in the history
  • Loading branch information
Meteriox committed Nov 23, 2023
1 parent 57214a7 commit e408f86
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions ami/kube/kube_yaml.go
Original file line number Diff line number Diff line change
Expand Up @@ -133,22 +133,24 @@ func (k *kubeImpl) deleteYamlApp(ns string, appName string, cfgs map[string]spec
}
objs := parseK8SYaml(data)
if len(objs) == 0 {
k.log.Info("no k8s object found in cfg data")
continue
}
for _, obj := range objs {
meta, err := meta.Accessor(obj)
if err != nil {
k.log.Error("failed to transfer k8s obj to metav1 obj", log.Any("error", err))
k.log.Info("failed to transfer k8s obj to metav1 obj", log.Any("error", err))
continue
}
rsc := k.getResourceMapping(obj, k.cli.discovery)
if rsc == nil {
k.log.Info("failed to get k8s server resource for obj")
continue
}
err = k.cli.dynamic.Resource(*rsc).Namespace(ns).Delete(context.Background(), meta.GetName(), metav1.DeleteOptions{})
deletePolicy := metav1.DeletePropagationForeground
err = k.cli.dynamic.Resource(*rsc).Namespace(ns).Delete(context.Background(), meta.GetName(), metav1.DeleteOptions{PropagationPolicy: &deletePolicy})
if err != nil {
k.log.Info("no k8s resource found to delete", log.Any("name", meta.GetName()))
k.log.Info("no k8s resource found to delete", log.Any("name", meta.GetName()), log.Any("error", err))
continue
}
}
Expand Down

0 comments on commit e408f86

Please sign in to comment.