Skip to content
This repository was archived by the owner on Jul 30, 2021. It is now read-only.

Commit 76f8764

Browse files
authored
Merge pull request #83 from aaronlevy/cleanup
Cleanup
2 parents 82e4707 + 2b5a226 commit 76f8764

File tree

6 files changed

+16
-76
lines changed

6 files changed

+16
-76
lines changed

cmd/checkpoint/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
"k8s.io/kubernetes/pkg/api"
1616
"k8s.io/kubernetes/pkg/api/unversioned"
1717
"k8s.io/kubernetes/pkg/api/v1"
18-
clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2"
18+
clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_3"
1919
"k8s.io/kubernetes/pkg/client/unversioned/clientcmd"
2020
clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api"
2121
)

hack/multi-node/Vagrantfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ require 'yaml'
88

99
Vagrant.require_version ">= 1.6.0"
1010

11-
$update_channel = "alpha"
11+
$update_channel = "stable"
1212
$controller_count = 1
1313
$controller_vm_memory = 2048
1414
$worker_count = 1
15-
$worker_vm_memory = 512
15+
$worker_vm_memory = 1024
1616
$etcd_count = 1
1717
$etcd_vm_memory = 512
1818

hack/single-node/Vagrantfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ require 'open-uri'
66
require 'tempfile'
77
require 'yaml'
88

9+
$update_channel = "stable"
10+
911
Vagrant.require_version ">= 1.6.0"
1012

1113
NODE_IP = "172.17.4.100"
@@ -15,17 +17,17 @@ Vagrant.configure("2") do |config|
1517
# always use Vagrant's insecure key
1618
config.ssh.insert_key = false
1719

18-
config.vm.box = "coreos-alpha"
20+
config.vm.box = "coreos-%s" % $update_channel
1921
config.vm.box_version = ">= 962.0.0"
20-
config.vm.box_url = "http://alpha.release.core-os.net/amd64-usr/current/coreos_production_vagrant.json"
22+
config.vm.box_url = "http://%s.release.core-os.net/amd64-usr/current/coreos_production_vagrant.json" % $update_channel
2123

2224
["vmware_fusion", "vmware_workstation"].each do |vmware|
2325
config.vm.provider vmware do |v, override|
2426
v.vmx['numvcpus'] = 1
2527
v.vmx['memsize'] = 2048
2628
v.gui = false
2729

28-
override.vm.box_url = "http://alpha.release.core-os.net/amd64-usr/current/coreos_production_vagrant_vmware_fusion.json"
30+
override.vm.box_url = "http://%s.release.core-os.net/amd64-usr/current/coreos_production_vagrant_vmware_fusion.json" % $update_channel
2931
end
3032
end
3133

pkg/bootkube/create.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"github.com/golang/glog"
88
"k8s.io/kubernetes/pkg/api"
99
apierrors "k8s.io/kubernetes/pkg/api/errors"
10-
clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2"
10+
clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_3"
1111
"k8s.io/kubernetes/pkg/client/restclient"
1212
"k8s.io/kubernetes/pkg/client/unversioned/clientcmd"
1313
clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api"

pkg/bootkube/proxy.go

Lines changed: 0 additions & 63 deletions
This file was deleted.

pkg/bootkube/status.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ import (
88

99
"github.com/golang/glog"
1010
"k8s.io/kubernetes/pkg/api"
11+
"k8s.io/kubernetes/pkg/api/v1"
1112
"k8s.io/kubernetes/pkg/client/cache"
12-
clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2"
13+
clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_3"
1314
"k8s.io/kubernetes/pkg/client/restclient"
1415
"k8s.io/kubernetes/pkg/controller/framework"
1516
"k8s.io/kubernetes/pkg/labels"
@@ -67,7 +68,7 @@ func (s *statusController) Run() {
6768
return s.client.Core().Pods(api.NamespaceSystem).Watch(options)
6869
},
6970
},
70-
&api.Pod{},
71+
&v1.Pod{},
7172
30*time.Minute,
7273
framework.ResourceEventHandlerFuncs{},
7374
)
@@ -85,15 +86,15 @@ func (s *statusController) AllRunning() (bool, error) {
8586
running := true
8687
for p, s := range ps {
8788
glog.Infof("Pod status %s: %s", p, s)
88-
if s != api.PodRunning {
89+
if s != v1.PodRunning {
8990
running = false
9091
}
9192
}
9293
return running, nil
9394
}
9495

95-
func (s *statusController) PodStatus() (map[string]api.PodPhase, error) {
96-
status := make(map[string]api.PodPhase)
96+
func (s *statusController) PodStatus() (map[string]v1.PodPhase, error) {
97+
status := make(map[string]v1.PodPhase)
9798

9899
podNames := s.podStore.ListKeys()
99100
for _, pod := range s.watchPods {
@@ -112,7 +113,7 @@ func (s *statusController) PodStatus() (map[string]api.PodPhase, error) {
112113
status[pod] = doesNotExist
113114
continue
114115
}
115-
if p, ok := p.(*api.Pod); ok {
116+
if p, ok := p.(*v1.Pod); ok {
116117
status[pod] = p.Status.Phase
117118
}
118119
}

0 commit comments

Comments
 (0)