Merge pull request #41500 from luxas/kubeadm_set_orphans

Automatic merge from submit-queue (batch tested with PRs 41420, 41500) Set OrphanDependents=&falseVar so the GC will (or should) remove the dummy Pod **What this PR does / why we need it**: ref: https://github.com/kubernetes/kubeadm/issues/149 **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: This doesn't remove the Pod yet, only the ReplicaSet, but once the GC is working as expected, it'll remove the Pod with this configuration **Release note**: ```release-note NONE ``` @errordeveloper @mikedanese @pires @caesarxuchao @krmayankk @kargakis

Merge pull request #41500 from luxas/kubeadm_set_orphans
c2ad28be · Kubernetes Submit Queue · GitHub · bd1a2221 · 8cc265d9 · c2ad28be
Commit c2ad28be authored Feb 19, 2017 by Kubernetes Submit Queue Committed by GitHub Feb 19, 2017
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

apiclient.go cmd/kubeadm/app/master/apiclient.go +4 -2

No files found.
--- a/cmd/kubeadm/app/master/apiclient.go
+++ b/cmd/kubeadm/app/master/apiclient.go
@@ -139,8 +139,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