Merge pull request #39 from dtan4/update-examples

Make example codes buildable with the latest client-go
This commit is contained in:
Chao Xu 2016-11-21 14:09:49 -08:00 committed by GitHub
commit ecd05810bd
4 changed files with 22 additions and 22 deletions

View File

@ -20,9 +20,9 @@ import (
"fmt" "fmt"
"time" "time"
"k8s.io/client-go/1.4/kubernetes" "k8s.io/client-go/kubernetes"
"k8s.io/client-go/1.4/pkg/api" "k8s.io/client-go/pkg/api/v1"
"k8s.io/client-go/1.4/rest" "k8s.io/client-go/rest"
) )
func main() { func main() {
@ -37,7 +37,7 @@ func main() {
panic(err.Error()) panic(err.Error())
} }
for { for {
pods, err := clientset.Core().Pods("").List(api.ListOptions{}) pods, err := clientset.Core().Pods("").List(v1.ListOptions{})
if err != nil { if err != nil {
panic(err.Error()) panic(err.Error())
} }

View File

@ -21,9 +21,9 @@ import (
"fmt" "fmt"
"time" "time"
"k8s.io/client-go/1.4/kubernetes" "k8s.io/client-go/kubernetes"
"k8s.io/client-go/1.4/pkg/api" "k8s.io/client-go/pkg/api/v1"
"k8s.io/client-go/1.4/tools/clientcmd" "k8s.io/client-go/tools/clientcmd"
) )
var ( var (
@ -43,7 +43,7 @@ func main() {
panic(err.Error()) panic(err.Error())
} }
for { for {
pods, err := clientset.Core().Pods("").List(api.ListOptions{}) pods, err := clientset.Core().Pods("").List(v1.ListOptions{})
if err != nil { if err != nil {
panic(err.Error()) panic(err.Error())
} }

View File

@ -4,19 +4,19 @@ import (
"flag" "flag"
"fmt" "fmt"
"k8s.io/client-go/1.5/kubernetes" "k8s.io/client-go/kubernetes"
"k8s.io/client-go/1.5/pkg/api" "k8s.io/client-go/pkg/api"
"k8s.io/client-go/1.5/pkg/api/errors" "k8s.io/client-go/pkg/api/errors"
"k8s.io/client-go/1.5/pkg/api/unversioned" "k8s.io/client-go/pkg/api/unversioned"
"k8s.io/client-go/1.5/pkg/api/v1" "k8s.io/client-go/pkg/api/v1"
"k8s.io/client-go/1.5/pkg/apis/extensions/v1beta1" "k8s.io/client-go/pkg/apis/extensions/v1beta1"
"k8s.io/client-go/1.5/pkg/runtime" "k8s.io/client-go/pkg/runtime"
"k8s.io/client-go/1.5/pkg/runtime/serializer" "k8s.io/client-go/pkg/runtime/serializer"
"k8s.io/client-go/1.5/rest" "k8s.io/client-go/rest"
"k8s.io/client-go/1.5/tools/clientcmd" "k8s.io/client-go/tools/clientcmd"
// Only required to authenticate against GKE clusters // 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 ( var (

View File

@ -3,9 +3,9 @@ package main
import ( import (
"encoding/json" "encoding/json"
"k8s.io/client-go/1.5/pkg/api" "k8s.io/client-go/pkg/api"
"k8s.io/client-go/1.5/pkg/api/meta" "k8s.io/client-go/pkg/api/meta"
"k8s.io/client-go/1.5/pkg/api/unversioned" "k8s.io/client-go/pkg/api/unversioned"
) )
type ExampleSpec struct { type ExampleSpec struct {