Merge pull request #178 from kenan435/strip-nonessential-info

aaronlevy · web-flow · commit 4152ac38b732 · 2016-11-14T16:20:59.000-08:00
Stripping of nonessential info prior to checkpointing
diff --git a/cmd/checkpoint/main.go b/cmd/checkpoint/main.go
@@ -90,10 +90,16 @@ func run() {
 				}
 			}
 		}
-		time.Sleep(60 * time.Second)
+		time.Sleep(1 * time.Second)
 	}
 }
 
+func stripNonessentialInfo(p *v1.Pod) {
+	p.Spec.ServiceAccountName = ""
+	p.Spec.DeprecatedServiceAccount = ""
+	p.Status.Reset()
+}
+
 func getPodsFromKubeletAPI() []byte {
 	var pods []byte
 	res, err := http.Get(kubeletAPIPodsURL)
@@ -183,6 +189,7 @@ func parseAPIPodSpec(podList v1.PodList) v1.PodSpec {
 		}
 	}
 	cleanVolumes(&apiPod)
+	stripNonessentialInfo(&apiPod)
 	return apiPod.Spec
 }
 

Original file line number	Diff line number	Diff line change
`@@ -90,10 +90,16 @@ func run() {`
`90`	`90`	`}`
`91`	`91`	`}`
`92`	`92`	`}`
`93`		`- time.Sleep(60 * time.Second)`
	`93`	`+ time.Sleep(1 * time.Second)`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`
	`97`	`+func stripNonessentialInfo(p *v1.Pod) {`
	`98`	`+ p.Spec.ServiceAccountName = ""`
	`99`	`+ p.Spec.DeprecatedServiceAccount = ""`
	`100`	`+ p.Status.Reset()`
	`101`	`+}`
	`102`	`+`
`97`	`103`	`func getPodsFromKubeletAPI() []byte {`
`98`	`104`	`var pods []byte`
`99`	`105`	`res, err := http.Get(kubeletAPIPodsURL)`
`@@ -183,6 +189,7 @@ func parseAPIPodSpec(podList v1.PodList) v1.PodSpec {`
`183`	`189`	`}`
`184`	`190`	`}`
`185`	`191`	`cleanVolumes(&apiPod)`
	`192`	`+ stripNonessentialInfo(&apiPod)`
`186`	`193`	`return apiPod.Spec`
`187`	`194`	`}`
`188`	`195`