github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add TODO for removing kubectl DaemonSet deletion hack

pull/8/head
Janet Kuo 2018-06-06 11:04:41 -07:00
parent fedd5d6206
commit 710d524b98
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubectl/cmd/delete.go
View File

@ -291,8 +291,8 @@ func (o *DeleteOptions) DeleteResult(r *resource.Result) error {
}
func (o *DeleteOptions) deleteResource(info *resource.Info, deleteOptions *metav1.DeleteOptions) error {
// TODO: this should be removed as soon as DaemonSet controller properly handles object deletion
// see https://github.com/kubernetes/kubernetes/issues/64313 for details
// TODO: Remove this in or after 1.12 release.
// Server version >= 1.11 no longer needs this hack.
mapping := info.ResourceMapping()
if mapping.Resource.GroupResource() == (schema.GroupResource{Group: "extensions", Resource: "daemonsets"}) ||
mapping.Resource.GroupResource() == (schema.GroupResource{Group: "apps", Resource: "daemonsets"}) {
@ -309,6 +309,8 @@ func (o *DeleteOptions) deleteResource(info *resource.Info, deleteOptions *metav
return nil
}
// TODO: Remove this in or after 1.12 release.
// Server version >= 1.11 no longer needs this hack.
func updateDaemonSet(namespace, name string, dynamicClient dynamic.Interface) error {
dsClient := dynamicClient.Resource(schema.GroupVersionResource{Group: "apps", Version: "v1", Resource: "daemonsets"}).Namespace(namespace)
obj, err := dsClient.Get(name, metav1.GetOptions{})