Merge pull request #83 from aaronlevy/cleanup

Cleanup

Author: aaronlevy

cmd/checkpoint/main.go

@@ -15,7 +15,7 @@ import (
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/api/v1"
-	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2"
+	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_3"
 	"k8s.io/kubernetes/pkg/client/unversioned/clientcmd"
 	clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api"
 )

hack/multi-node/Vagrantfile

@@ -8,11 +8,11 @@ require 'yaml'
 
 Vagrant.require_version ">= 1.6.0"
 
-$update_channel = "alpha"
+$update_channel = "stable"
 $controller_count = 1
 $controller_vm_memory = 2048
 $worker_count = 1
-$worker_vm_memory = 512
+$worker_vm_memory = 1024
 $etcd_count = 1
 $etcd_vm_memory = 512
 

hack/single-node/Vagrantfile

@@ -6,6 +6,8 @@ require 'open-uri'
 require 'tempfile'
 require 'yaml'
 
+$update_channel = "stable"
+
 Vagrant.require_version ">= 1.6.0"
 
 NODE_IP = "172.17.4.100"
@@ -15,17 +17,17 @@ Vagrant.configure("2") do |config|
   # always use Vagrant's insecure key
   config.ssh.insert_key = false
 
-  config.vm.box = "coreos-alpha"
+  config.vm.box = "coreos-%s" % $update_channel
   config.vm.box_version = ">= 962.0.0"
-  config.vm.box_url = "http://alpha.release.core-os.net/amd64-usr/current/coreos_production_vagrant.json"
+  config.vm.box_url = "http://%s.release.core-os.net/amd64-usr/current/coreos_production_vagrant.json" % $update_channel
 
   ["vmware_fusion", "vmware_workstation"].each do |vmware|
     config.vm.provider vmware do |v, override|
       v.vmx['numvcpus'] = 1
       v.vmx['memsize'] = 2048
       v.gui = false
 
-      override.vm.box_url = "http://alpha.release.core-os.net/amd64-usr/current/coreos_production_vagrant_vmware_fusion.json"
+      override.vm.box_url = "http://%s.release.core-os.net/amd64-usr/current/coreos_production_vagrant_vmware_fusion.json" % $update_channel
     end
   end
 

pkg/bootkube/create.go

@@ -7,7 +7,7 @@ import (
 	"github.com/golang/glog"
 	"k8s.io/kubernetes/pkg/api"
 	apierrors "k8s.io/kubernetes/pkg/api/errors"
-	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2"
+	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_3"
 	"k8s.io/kubernetes/pkg/client/restclient"
 	"k8s.io/kubernetes/pkg/client/unversioned/clientcmd"
 	clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api"

pkg/bootkube/proxy.go

@@ -8,8 +8,9 @@ import (
 
 	"github.com/golang/glog"
 	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/client/cache"
-	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2"
+	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_3"
 	"k8s.io/kubernetes/pkg/client/restclient"
 	"k8s.io/kubernetes/pkg/controller/framework"
 	"k8s.io/kubernetes/pkg/labels"
@@ -67,7 +68,7 @@ func (s *statusController) Run() {
 				return s.client.Core().Pods(api.NamespaceSystem).Watch(options)
 			},
 		},
-		&api.Pod{},
+		&v1.Pod{},
 		30*time.Minute,
 		framework.ResourceEventHandlerFuncs{},
 	)
@@ -85,15 +86,15 @@ func (s *statusController) AllRunning() (bool, error) {
 	running := true
 	for p, s := range ps {
 		glog.Infof("Pod status %s: %s", p, s)
-		if s != api.PodRunning {
+		if s != v1.PodRunning {
 			running = false
 		}
 	}
 	return running, nil
 }
 
-func (s *statusController) PodStatus() (map[string]api.PodPhase, error) {
-	status := make(map[string]api.PodPhase)
+func (s *statusController) PodStatus() (map[string]v1.PodPhase, error) {
+	status := make(map[string]v1.PodPhase)
 
 	podNames := s.podStore.ListKeys()
 	for _, pod := range s.watchPods {
@@ -112,7 +113,7 @@ func (s *statusController) PodStatus() (map[string]api.PodPhase, error) {
 			status[pod] = doesNotExist
 			continue
 		}
-		if p, ok := p.(*api.Pod); ok {
+		if p, ok := p.(*v1.Pod); ok {
 			status[pod] = p.Status.Phase
 		}
 	}