Merge pull request #89 from mengqiy/rebase_k8s_1_10

rebase on k8s 1.10.1

Author: droot

Gopkg.lock

@@ -13,69 +13,54 @@
 #  limitations under the License.
 
 # Packages required by users
-required = ["github.com/kubernetes-sig-testing/frameworks/integration",
+required = ["sigs.k8s.io/testing_frameworks/integration",
             "k8s.io/client-go/plugin/pkg/client/auth",
             "github.com/spf13/pflag"]
 
-[prune]
-  go-tests = true
-
 [[constraint]]
   version = "KUBEBUILDER_VERSION"
   name = "github.com/kubernetes-sigs/kubebuilder"
 
 [[constraint]]
-  name = "github.com/golang/glog"
-  revision = "44145f04b68cf362d9c4df2182967c2275eaefed"
+  name = "sigs.k8s.io/testing_frameworks"
+  revision = "f53464b8b84b4507805a0b033a8377b225163fea"
 
 [[constraint]]
-  name = "github.com/onsi/ginkgo"
-  version = "1.4.0"
+  branch = "master"
+  name = "github.com/markbates/inflect"
 
 [[constraint]]
   name = "github.com/onsi/gomega"
-  version = "1.2.0"
+  version = "1.3.0"
 
 [[constraint]]
   name = "github.com/pkg/errors"
-  revision = "a22138067af1c4942683050411a841ade67fe1eb"
-
-[[constraint]]
-  name = "github.com/spf13/cobra"
-  revision = "f62e98d28ab7ad31d707ba837a966378465c7b57"
+  version = "0.8.0"
 
 [[constraint]]
-  name = "github.com/spf13/pflag"
-  revision = "9ff6c6923cfffbcd502984b8e0c80539a94968b7"
-
-[[constraint]]
-  branch = "release-1.9"
   name = "k8s.io/api"
+  version = "kubernetes-1.10.1"
 
 [[constraint]]
-  branch = "release-1.9"
   name = "k8s.io/apiextensions-apiserver"
+  version = "kubernetes-1.10.1"
 
 [[constraint]]
-  branch = "release-1.9"
   name = "k8s.io/apimachinery"
+  version = "kubernetes-1.10.1"
 
 [[constraint]]
-  branch = "release-1.9"
   name = "k8s.io/apiserver"
+  version = "kubernetes-1.10.1"
 
 [[constraint]]
-  branch = "release-6.0"
   name = "k8s.io/client-go"
+  version = "kubernetes-1.10.1"
 
 [[constraint]]
-  branch = "release-1.9"
   name = "k8s.io/kube-aggregator"
+  version = "kubernetes-1.10.1"
 
-[[override]]
-  name = "github.com/Azure/go-autorest"
-  version = "v9.1.0"
-
-[[override]]
-  name = "github.com/emicklei/go-restful"
-  revision = "ff4f55a206334ef123e4f79bbf348980da81ca46"
+[prune]
+  go-tests = true
+  unused-packages = true

Gopkg.toml

@@ -22,7 +22,7 @@ import (
 	extensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	"k8s.io/client-go/rest"
 
-	"github.com/kubernetes-sig-testing/frameworks/integration"
+	"sigs.k8s.io/testing_frameworks/integration"
 	"github.com/kubernetes-sigs/kubebuilder/pkg/install"
 )
 

pkg/test/server.go

@@ -16,7 +16,7 @@
  ignored = ["github.com/kubernetes-sigs/kubebuilder","github.com/kubernetes-sigs/kubebuilder/cmd"]
 
 # Packages required by users
-required = ["github.com/kubernetes-sig-testing/frameworks/integration",
+required = ["sigs.k8s.io/testing_frameworks/integration",
             "k8s.io/client-go/plugin/pkg/client/auth",
             "github.com/spf13/pflag"]
 

samples/full/controller/src/samplecontroller/Gopkg.lock

@@ -25,7 +25,7 @@ cd "$base_dir" || {
   exit 1
 }
 
-k8s_version=1.9
+k8s_version=1.10
 goarch=amd64
 goos="unknown"