Merge pull request #584 from mengqiy/use_1_13_in_test_project

🏃 update k8s dep for test project
kubernetes-sigs · Jan 31, 2019 · b24e086 · b24e086
2 parents dd9e0fd + 3081aef
commit b24e086
Show file tree

Hide file tree

Showing 581 changed files with 24,355 additions and 12,419 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -17,7 +17,7 @@ required = [
 
 [[constraint]]
   name="k8s.io/code-generator"
-  version="kubernetes-1.12.3"
+  version="kubernetes-1.13.1"
 
 # For dependency below: Refer to issue https://github.com/golang/dep/issues/1799
 [[override]]

diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go
@@ -24,11 +24,11 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/golang/glog"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"github.com/spf13/pflag"
 
+	"k8s.io/klog"
 	"sigs.k8s.io/kubebuilder/test/e2e/framework"
 	"sigs.k8s.io/kubebuilder/test/e2e/framework/ginkgowrapper"
 )
@@ -76,7 +76,7 @@ var _ = AfterSuite(func() {
 // E2E tests using the Ginkgo runner.
 func RunE2ETests(t *testing.T) {
 	RegisterFailHandler(ginkgowrapper.Fail)
-	glog.Infof("Starting kubebuilder suite")
+	klog.Infof("Starting kubebuilder suite")
 	RunSpecs(t, "Kubebuilder e2e suite")
 }
 

diff --git a/...or/github.com/mattbaird/jsonpatch/LICENSE → vendor/github.com/appscode/jsonpatch/LICENSE b/...or/github.com/mattbaird/jsonpatch/LICENSE → vendor/github.com/appscode/jsonpatch/LICENSE