From d83a7abb0c29040adaeb213f78ba0087d755caf4 Mon Sep 17 00:00:00 2001 From: Daisuke Fujita Date: Tue, 15 Nov 2016 10:42:44 +0900 Subject: [PATCH 1/3] Make out-of-cluster example buildable --- examples/out-of-cluster/main.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/out-of-cluster/main.go b/examples/out-of-cluster/main.go index 50875d14..7919d927 100644 --- a/examples/out-of-cluster/main.go +++ b/examples/out-of-cluster/main.go @@ -21,9 +21,9 @@ import ( "fmt" "time" - "k8s.io/client-go/1.4/kubernetes" - "k8s.io/client-go/1.4/pkg/api" - "k8s.io/client-go/1.4/tools/clientcmd" + "k8s.io/client-go/kubernetes" + "k8s.io/client-go/pkg/api/v1" + "k8s.io/client-go/tools/clientcmd" ) var ( @@ -43,7 +43,7 @@ func main() { panic(err.Error()) } for { - pods, err := clientset.Core().Pods("").List(api.ListOptions{}) + pods, err := clientset.Core().Pods("").List(v1.ListOptions{}) if err != nil { panic(err.Error()) } From e60355686b83d96b4f91fcb6abab716238e3ed70 Mon Sep 17 00:00:00 2001 From: Daisuke Fujita Date: Tue, 15 Nov 2016 10:43:26 +0900 Subject: [PATCH 2/3] Make in-cluster example buildable --- examples/in-cluster/main.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/in-cluster/main.go b/examples/in-cluster/main.go index d7858761..04b0798e 100644 --- a/examples/in-cluster/main.go +++ b/examples/in-cluster/main.go @@ -20,9 +20,9 @@ import ( "fmt" "time" - "k8s.io/client-go/1.4/kubernetes" - "k8s.io/client-go/1.4/pkg/api" - "k8s.io/client-go/1.4/rest" + "k8s.io/client-go/kubernetes" + "k8s.io/client-go/pkg/api/v1" + "k8s.io/client-go/rest" ) func main() { @@ -37,7 +37,7 @@ func main() { panic(err.Error()) } for { - pods, err := clientset.Core().Pods("").List(api.ListOptions{}) + pods, err := clientset.Core().Pods("").List(v1.ListOptions{}) if err != nil { panic(err.Error()) } From b51b7defabcf6337c72d33945dd571116eafbf2c Mon Sep 17 00:00:00 2001 From: Daisuke Fujita Date: Tue, 15 Nov 2016 10:47:29 +0900 Subject: [PATCH 3/3] Make third-party example buildable --- examples/third-party-resources/main.go | 22 +++++++++++----------- examples/third-party-resources/types.go | 6 +++--- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/examples/third-party-resources/main.go b/examples/third-party-resources/main.go index 9421e2f1..d59ed92c 100644 --- a/examples/third-party-resources/main.go +++ b/examples/third-party-resources/main.go @@ -4,19 +4,19 @@ import ( "flag" "fmt" - "k8s.io/client-go/1.5/kubernetes" - "k8s.io/client-go/1.5/pkg/api" - "k8s.io/client-go/1.5/pkg/api/errors" - "k8s.io/client-go/1.5/pkg/api/unversioned" - "k8s.io/client-go/1.5/pkg/api/v1" - "k8s.io/client-go/1.5/pkg/apis/extensions/v1beta1" - "k8s.io/client-go/1.5/pkg/runtime" - "k8s.io/client-go/1.5/pkg/runtime/serializer" - "k8s.io/client-go/1.5/rest" - "k8s.io/client-go/1.5/tools/clientcmd" + "k8s.io/client-go/kubernetes" + "k8s.io/client-go/pkg/api" + "k8s.io/client-go/pkg/api/errors" + "k8s.io/client-go/pkg/api/unversioned" + "k8s.io/client-go/pkg/api/v1" + "k8s.io/client-go/pkg/apis/extensions/v1beta1" + "k8s.io/client-go/pkg/runtime" + "k8s.io/client-go/pkg/runtime/serializer" + "k8s.io/client-go/rest" + "k8s.io/client-go/tools/clientcmd" // Only required to authenticate against GKE clusters - _ "k8s.io/client-go/1.5/plugin/pkg/client/auth/gcp" + _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" ) var ( diff --git a/examples/third-party-resources/types.go b/examples/third-party-resources/types.go index c6dd2e1d..6ff43ccc 100644 --- a/examples/third-party-resources/types.go +++ b/examples/third-party-resources/types.go @@ -3,9 +3,9 @@ package main import ( "encoding/json" - "k8s.io/client-go/1.5/pkg/api" - "k8s.io/client-go/1.5/pkg/api/meta" - "k8s.io/client-go/1.5/pkg/api/unversioned" + "k8s.io/client-go/pkg/api" + "k8s.io/client-go/pkg/api/meta" + "k8s.io/client-go/pkg/api/unversioned" ) type ExampleSpec struct {