Revert "checkpoint: make run func generic"

This reverts commit db0d731.

Author: aaronlevy

cmd/checkpoint/main.go

@@ -25,15 +25,17 @@ const (
 	kubeletAPIPodsURL = "http://127.0.0.1:10255/pods"
 	ignorePath        = "/srv/kubernetes/manifests"
 	activePath        = "/etc/kubernetes/manifests"
+	manifestFilename  = "apiserver.json"
 	kubeconfigPath    = "/etc/kubernetes/kubeconfig"
 	secretsPath       = "/etc/kubernetes/checkpoint-secrets"
-
-	tempAPIServer = "temp-apiserver"
-	kubeAPIServer = "kube-apiserver"
 )
 
 var (
-	secureAPIAddr = fmt.Sprintf("https://%s:%s", os.Getenv("KUBERNETES_SERVICE_HOST"), os.Getenv("KUBERNETES_SERVICE_PORT_HTTPS"))
+	tempAPIServer      = []byte("temp-apiserver")
+	kubeAPIServer      = []byte("kube-apiserver")
+	activeManifest     = filepath.Join(activePath, manifestFilename)
+	checkpointManifest = filepath.Join(ignorePath, manifestFilename)
+	secureAPIAddr      = fmt.Sprintf("https://%s:%s", os.Getenv("KUBERNETES_SERVICE_HOST"), os.Getenv("KUBERNETES_SERVICE_PORT_HTTPS"))
 )
 
 var tempAPIServerManifest = v1.Pod{
@@ -43,58 +45,50 @@ var tempAPIServerManifest = v1.Pod{
 	},
 	ObjectMeta: v1.ObjectMeta{
 		Name:      "temp-apiserver",
-		Namespace: api.NamespaceSystem,
+		Namespace: "kube-system",
 	},
 }
 
-var tempPodSpecMap = map[string]v1.Pod{
-	tempAPIServer: tempAPIServerManifest,
-}
-
 func main() {
 	flag.Set("logtostderr", "true")
 	defer glog.Flush()
-	glog.Info("begin pods checkpointing...")
-	run(kubeAPIServer, tempAPIServer, api.NamespaceSystem)
+	glog.Info("begin apiserver checkpointing...")
+	run()
 }
 
-func run(actualPodName, tempPodName, namespace string) {
+func run() {
 	client := newAPIClient()
 	for {
 		var podList v1.PodList
 		if err := json.Unmarshal(getPodsFromKubeletAPI(), &podList); err != nil {
 			glog.Fatal(err)
 		}
 		switch {
-		case bothRunning(podList, actualPodName, tempPodName, namespace):
-			glog.Infof("both temp %v and actual %v pods running, removing temp pod", actualPodName, tempPodName)
-			// Both the temp and actual pods are running.
-			// Remove the temp manifest from the config dir so that the
+		case bothAPIServersRunning(podList):
+			glog.Info("both temp and kube apiserver running, removing temp apiserver")
+			// Both the self-hosted API Server and the temp API Server are running.
+			// Remove the temp API Server manifest from the config dir so that the
 			// kubelet will stop it.
-			if err := os.Remove(activeManifest(tempPodName)); err != nil {
+			if err := os.Remove(activeManifest); err != nil {
 				glog.Error(err)
 			}
-		case isPodRunning(podList, client, actualPodName, namespace):
-			glog.Infof("actual pod %v found, creating temp pod manifest", actualPodName)
-			// The actual is running. Let's snapshot the pod,
+		case kubeSystemAPIServerRunning(podList, client):
+			glog.Info("kube-apiserver found, creating temp-apiserver manifest")
+			// The self-hosted API Server 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)
-			glog.Infof("finished creating temp pod %v manifest at %s\n", tempPodName, checkpointManifest(tempPodName))
+			tempAPIServerManifest.Spec = parseAPIPodSpec(podList)
+			convertSecretsToVolumeMounts(client, &tempAPIServerManifest)
+			writeManifest(tempAPIServerManifest)
+			glog.Infof("finished creating temp-apiserver manifest at %s\n", checkpointManifest)
 
 		default:
-			glog.Info("no actual pod running, installing temp pod static manifest")
-			b, err := ioutil.ReadFile(checkpointManifest(tempPodName))
+			glog.Info("no apiserver running, installing temp apiserver static manifest")
+			b, err := ioutil.ReadFile(checkpointManifest)
 			if err != nil {
 				glog.Error(err)
 			} else {
-				if err := ioutil.WriteFile(activeManifest(tempPodName), b, 0644); err != nil {
+				if err := ioutil.WriteFile(activeManifest, b, 0644); err != nil {
 					glog.Error(err)
 				}
 			}
@@ -124,35 +118,36 @@ func getPodsFromKubeletAPI() []byte {
 	return pods
 }
 
-func bothRunning(pods v1.PodList, an, tn, ns string) bool {
-	var actualPodSeen, tempPodSeen bool
+func bothAPIServersRunning(pods v1.PodList) bool {
+	var kubeAPISeen, tempAPISeen bool
 	for _, p := range pods.Items {
-		actualPodSeen = actualPodSeen || isPod(p, an, ns)
-		tempPodSeen = tempPodSeen || isPod(p, tn, ns)
-		if actualPodSeen && tempPodSeen {
+		kubeAPISeen = kubeAPISeen || isKubeAPI(p)
+		tempAPISeen = tempAPISeen || isTempAPI(p)
+		if kubeAPISeen && tempAPISeen {
 			return true
 		}
 	}
 	return false
 }
 
-func isPodRunning(pods v1.PodList, client clientset.Interface, n, ns string) bool {
+func kubeSystemAPIServerRunning(pods v1.PodList, client clientset.Interface) bool {
 	for _, p := range pods.Items {
-		if isPod(p, n, ns) {
-			if n == kubeAPIServer {
-				// Make sure it's actually running. Sometimes we get that
-				// pod manifest back, but the server is not actually running.
-				_, err := client.Discovery().ServerVersion()
-				return err == nil
-			}
-			return true
+		if isKubeAPI(p) {
+			// Make sure it's actually running. Sometimes we get that
+			// pod manifest back, but the server is not actually running.
+			_, err := client.Discovery().ServerVersion()
+			return err == nil
 		}
 	}
 	return false
 }
 
-func isPod(pod v1.Pod, n, ns string) bool {
-	return strings.Contains(pod.Name, n) && pod.Namespace == ns
+func isKubeAPI(pod v1.Pod) bool {
+	return strings.Contains(pod.Name, "kube-apiserver") && pod.Namespace == api.NamespaceSystem
+}
+
+func isTempAPI(pod v1.Pod) bool {
+	return strings.Contains(pod.Name, "temp-apiserver") && pod.Namespace == api.NamespaceSystem
 }
 
 // cleanVolumes will sanitize the list of volumes and volume mounts
@@ -180,18 +175,18 @@ func cleanVolumes(p *v1.Pod) {
 // writeManifest will write the manifest to the ignore path.
 // It first writes the file to a temp file, and then atomically moves it into
 // the actual ignore path and correct file name.
-func writeManifest(manifest v1.Pod, name string) {
+func writeManifest(manifest v1.Pod) {
 	m, err := json.Marshal(manifest)
 	if err != nil {
 		glog.Fatal(err)
 	}
-	writeAndAtomicCopy(m, checkpointManifest(name))
+	writeAndAtomicCopy(m, checkpointManifest)
 }
 
-func parseAPIPodSpec(podList v1.PodList, n, ns string) v1.PodSpec {
+func parseAPIPodSpec(podList v1.PodList) v1.PodSpec {
 	var apiPod v1.Pod
 	for _, p := range podList.Items {
-		if isPod(p, n, ns) {
+		if isKubeAPI(p) {
 			apiPod = p
 			break
 		}
@@ -255,11 +250,3 @@ func writeAndAtomicCopy(data []byte, path string) {
 		glog.Fatal(err)
 	}
 }
-
-func activeManifest(name string) string {
-	return filepath.Join(activePath, name+".json")
-}
-
-func checkpointManifest(name string) string {
-	return filepath.Join(ignorePath, name+".json")
-}