From 8cc265d9c94d3d789c619c272a10f4190b66ca42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucas=20K=C3=A4ldstr=C3=B6m?= Date: Wed, 15 Feb 2017 20:11:55 +0200 Subject: [PATCH] Set OrphanDependents=&falseVar so the GC will (or should remove the dummy Pod --- cmd/kubeadm/app/master/apiclient.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cmd/kubeadm/app/master/apiclient.go b/cmd/kubeadm/app/master/apiclient.go index 214b71567f5..e2e04a08d42 100644 --- a/cmd/kubeadm/app/master/apiclient.go +++ b/cmd/kubeadm/app/master/apiclient.go @@ -156,8 +156,10 @@ func createAndWaitForADummyDeployment(client *clientset.Clientset) error { fmt.Println("[apiclient] Test deployment succeeded") - // TODO: In the future, make sure the ReplicaSet and Pod are garbage collected - if err := client.ExtensionsV1beta1().Deployments(metav1.NamespaceSystem).Delete("dummy", &metav1.DeleteOptions{}); err != nil { + falseVar := false + if err := client.ExtensionsV1beta1().Deployments(metav1.NamespaceSystem).Delete("dummy", &metav1.DeleteOptions{ + OrphanDependents: &falseVar, + }); err != nil { fmt.Printf("[apiclient] Failed to delete test deployment [%v] (will ignore)\n", err) } return nil