Merge pull request #269 from andyxning/bump_kubernetes_to_1.8

bump kubernetes to 1.8

Author: andyxning

Godeps/Godeps.json

@@ -27,7 +27,8 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 
-	v2batch "k8s.io/client-go/pkg/apis/batch/v2alpha1"
+	v2batch "k8s.io/api/batch/v2alpha1"
+	"k8s.io/apimachinery/pkg/fields"
 	"k8s.io/client-go/tools/cache"
 )
 
@@ -78,7 +79,7 @@ func (l CronJobLister) List() ([]v2batch.CronJob, error) {
 func RegisterCronJobCollector(registry prometheus.Registerer, kubeClient kubernetes.Interface, namespace string) {
 	client := kubeClient.BatchV2alpha1().RESTClient()
 	glog.Infof("collect cronjob with %s", client.APIVersion())
-	cjlw := cache.NewListWatchFromClient(client, "cronjobs", namespace, nil)
+	cjlw := cache.NewListWatchFromClient(client, "cronjobs", namespace, fields.Everything())
 	cjinf := cache.NewSharedInformer(cjlw, &v2batch.CronJob{}, resyncPeriod)
 
 	cronJobLister := CronJobLister(func() (cronjobs []v2batch.CronJob, err error) {

collectors/cronjob.go

@@ -20,9 +20,9 @@ import (
 	"testing"
 	"time"
 
+	v2batch "k8s.io/api/batch/v2alpha1"
+	"k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/client-go/pkg/api/v1"
-	v2batch "k8s.io/client-go/pkg/apis/batch/v2alpha1"
 )
 
 var (

collectors/cronjob_test.go

@@ -20,8 +20,9 @@ import (
 	"github.com/golang/glog"
 	"github.com/prometheus/client_golang/prometheus"
 	"golang.org/x/net/context"
+	"k8s.io/api/extensions/v1beta1"
+	"k8s.io/apimachinery/pkg/fields"
 	"k8s.io/client-go/kubernetes"
-	"k8s.io/client-go/pkg/apis/extensions/v1beta1"
 	"k8s.io/client-go/tools/cache"
 )
 
@@ -67,7 +68,7 @@ func (l DaemonSetLister) List() ([]v1beta1.DaemonSet, error) {
 func RegisterDaemonSetCollector(registry prometheus.Registerer, kubeClient kubernetes.Interface, namespace string) {
 	client := kubeClient.ExtensionsV1beta1().RESTClient()
 	glog.Infof("collect daemonset with %s", client.APIVersion())
-	dslw := cache.NewListWatchFromClient(client, "daemonsets", namespace, nil)
+	dslw := cache.NewListWatchFromClient(client, "daemonsets", namespace, fields.Everything())
 	dsinf := cache.NewSharedInformer(dslw, &v1beta1.DaemonSet{}, resyncPeriod)
 
 	dsLister := DaemonSetLister(func() (daemonsets []v1beta1.DaemonSet, err error) {

collectors/daemonset.go

@@ -20,8 +20,8 @@ import (
 	"testing"
 	"time"
 
+	"k8s.io/api/extensions/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/client-go/pkg/apis/extensions/v1beta1"
 )
 
 type mockDaemonSetStore struct {

collectors/daemonset_test.go

@@ -20,9 +20,10 @@ import (
 	"github.com/golang/glog"
 	"github.com/prometheus/client_golang/prometheus"
 	"golang.org/x/net/context"
+	"k8s.io/api/extensions/v1beta1"
+	"k8s.io/apimachinery/pkg/fields"
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/client-go/kubernetes"
-	"k8s.io/client-go/pkg/apis/extensions/v1beta1"
 	"k8s.io/client-go/tools/cache"
 )
 
@@ -104,7 +105,7 @@ func (l DeploymentLister) List() ([]v1beta1.Deployment, error) {
 func RegisterDeploymentCollector(registry prometheus.Registerer, kubeClient kubernetes.Interface, namespace string) {
 	client := kubeClient.ExtensionsV1beta1().RESTClient()
 	glog.Infof("collect deployment with %s", client.APIVersion())
-	dlw := cache.NewListWatchFromClient(client, "deployments", namespace, nil)
+	dlw := cache.NewListWatchFromClient(client, "deployments", namespace, fields.Everything())
 	dinf := cache.NewSharedInformer(dlw, &v1beta1.Deployment{}, resyncPeriod)
 
 	dplLister := DeploymentLister(func() (deployments []v1beta1.Deployment, err error) {

collectors/deployment.go

@@ -29,9 +29,9 @@ import (
 	dto "github.com/prometheus/client_model/go"
 	"github.com/prometheus/common/expfmt"
 
+	"k8s.io/api/extensions/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
-	"k8s.io/client-go/pkg/apis/extensions/v1beta1"
 )
 
 var (

collectors/deployment_test.go

@@ -20,8 +20,9 @@ import (
 	"github.com/golang/glog"
 	"github.com/prometheus/client_golang/prometheus"
 	"golang.org/x/net/context"
+	v1batch "k8s.io/api/batch/v1"
+	"k8s.io/apimachinery/pkg/fields"
 	"k8s.io/client-go/kubernetes"
-	v1batch "k8s.io/client-go/pkg/apis/batch/v1"
 	"k8s.io/client-go/tools/cache"
 )
 
@@ -97,7 +98,7 @@ func (l JobLister) List() ([]v1batch.Job, error) {
 func RegisterJobCollector(registry prometheus.Registerer, kubeClient kubernetes.Interface, namespace string) {
 	client := kubeClient.BatchV1().RESTClient()
 	glog.Infof("collect job with %s", client.APIVersion())
-	jlw := cache.NewListWatchFromClient(client, "jobs", namespace, nil)
+	jlw := cache.NewListWatchFromClient(client, "jobs", namespace, fields.Everything())
 	jinf := cache.NewSharedInformer(jlw, &v1batch.Job{}, resyncPeriod)
 
 	jobLister := JobLister(func() (jobs []v1batch.Job, err error) {

collectors/job.go

@@ -20,9 +20,9 @@ import (
 	"testing"
 	"time"
 
+	v1batch "k8s.io/api/batch/v1"
+	"k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/client-go/pkg/api/v1"
-	v1batch "k8s.io/client-go/pkg/apis/batch/v1"
 )
 
 var (

collectors/job_test.go

@@ -20,8 +20,9 @@ import (
 	"github.com/golang/glog"
 	"github.com/prometheus/client_golang/prometheus"
 	"golang.org/x/net/context"
+	"k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/fields"
 	"k8s.io/client-go/kubernetes"
-	"k8s.io/client-go/pkg/api/v1"
 	"k8s.io/client-go/tools/cache"
 )
 
@@ -54,7 +55,7 @@ func (l LimitRangeLister) List() (v1.LimitRangeList, error) {
 func RegisterLimitRangeCollector(registry prometheus.Registerer, kubeClient kubernetes.Interface, namespace string) {
 	client := kubeClient.CoreV1().RESTClient()
 	glog.Infof("collect limitrange with %s", client.APIVersion())
-	rqlw := cache.NewListWatchFromClient(client, "limitranges", namespace, nil)
+	rqlw := cache.NewListWatchFromClient(client, "limitranges", namespace, fields.Everything())
 	rqinf := cache.NewSharedInformer(rqlw, &v1.LimitRange{}, resyncPeriod)
 
 	limitRangeLister := LimitRangeLister(func() (ranges v1.LimitRangeList, err error) {