fixes e2e failure on gce with new .kubeconfig, kick travis

This commit is contained in:
deads2k
2015-01-08 08:40:02 -05:00
parent 005f2e1bda
commit 60a46e7d49
5 changed files with 239 additions and 49 deletions

View File

@@ -21,6 +21,7 @@ import (
"io"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
"github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl"
"github.com/spf13/cobra"
)
@@ -68,8 +69,11 @@ $ cat frontend-v2.json | kubectl rollingupdate frontend-v1 -f -
err = CompareNamespaceFromFile(cmd, namespace)
checkErr(err)
client, err := f.ClientBuilder.Client()
config, err := f.ClientConfig.ClientConfig()
checkErr(err)
client, err := client.New(config)
checkErr(err)
obj, err := mapping.Codec.Decode(data)
checkErr(err)
newRc := obj.(*api.ReplicationController)