checkpoint: remove template checkpoint pod spec

Author: xiang90

cmd/checkpoint/main.go

@@ -31,25 +31,15 @@ const (
 	kubeAPIServer = "kube-apiserver"
 )
 
+var podAPIServerMeta = unversioned.TypeMeta{
+	APIVersion: "v1",
+	Kind:       "Pod",
+}
+
 var (
 	secureAPIAddr = fmt.Sprintf("https://%s:%s", os.Getenv("KUBERNETES_SERVICE_HOST"), os.Getenv("KUBERNETES_SERVICE_PORT_HTTPS"))
 )
 
-var tempAPIServerManifest = v1.Pod{
-	TypeMeta: unversioned.TypeMeta{
-		APIVersion: "v1",
-		Kind:       "Pod",
-	},
-	ObjectMeta: v1.ObjectMeta{
-		Name:      "temp-apiserver",
-		Namespace: api.NamespaceSystem,
-	},
-}
-
-var tempPodSpecMap = map[string]v1.Pod{
-	tempAPIServer: tempAPIServerManifest,
-}
-
 func main() {
 	glog.Info("begin pods checkpointing...")
 	run(kubeAPIServer, tempAPIServer, api.NamespaceSystem)
@@ -76,13 +66,9 @@ func run(actualPodName, tempPodName, namespace string) {
 			// The actual is running. Let's snapshot the pod,
 			// clean it up a bit, and then save it to the ignore path for
 			// later use.
-			tempSpec, ok := tempPodSpecMap[tempPodName]
-			if !ok {
-				glog.Fatalf("cannot find pod spec for %v", tempPodName)
-			}
-			tempSpec.Spec = parseAPIPodSpec(podList, actualPodName, namespace)
-			convertSecretsToVolumeMounts(client, &tempSpec)
-			writeManifest(tempSpec, tempPodName)
+			checkpointPod := createCheckpointPod(podList, actualPodName, namespace)
+			convertSecretsToVolumeMounts(client, &checkpointPod)
+			writeManifest(checkpointPod, tempPodName)
 			glog.Infof("finished creating temp pod %v manifest at %s\n", tempPodName, checkpointManifest(tempPodName))
 
 		default:
@@ -185,17 +171,20 @@ func writeManifest(manifest v1.Pod, name string) {
 	writeAndAtomicCopy(m, checkpointManifest(name))
 }
 
-func parseAPIPodSpec(podList v1.PodList, n, ns string) v1.PodSpec {
-	var apiPod v1.Pod
+func createCheckpointPod(podList v1.PodList, n, ns string) v1.Pod {
+	var checkpointPod v1.Pod
 	for _, p := range podList.Items {
 		if isPod(p, n, ns) {
-			apiPod = p
+			checkpointPod = p
 			break
 		}
 	}
-	cleanVolumes(&apiPod)
-	stripNonessentialInfo(&apiPod)
-	return apiPod.Spec
+	// the pod we manifest we got from kubelet does not have TypeMeta.
+	// Add it now.
+	checkpointPod.TypeMeta = podAPIServerMeta
+	cleanVolumes(&checkpointPod)
+	stripNonessentialInfo(&checkpointPod)
+	return checkpointPod
 }
 
 func newAPIClient() clientset.Interface {