Merge pull request kubernetes-csi#71 from xing-yang/update_vendor_files

Update vendor files to point to kubernetes-1.12.0-beta.1
kbsonlong · Sep 18, 2018 · 4ca8246 · 4ca8246
2 parents 6ff7c80 + 025fb31
commit 4ca8246
Show file tree

Hide file tree

Showing 1,173 changed files with 96,085 additions and 23,204 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -26,12 +26,16 @@
 
 [[constraint]]
   name = "k8s.io/api"
-  version = "kubernetes-1.10.0-beta.1"
+  version = "kubernetes-1.12.0-beta.1"
 
 [[constraint]]
   name = "k8s.io/apimachinery"
-  version = "kubernetes-1.10.0-beta.1"
+  version = "kubernetes-1.12.0-beta.1"
 
 [[constraint]]
   name = "k8s.io/client-go"
-  branch = "master"
+  version = "kubernetes-1.12.0-beta.1"
+
+[[override]]
+  name = "github.com/json-iterator/go"
+  version = "1.1.4"
diff --git a/cmd/csi-attacher/leader.go b/cmd/csi-attacher/leader.go
@@ -17,6 +17,7 @@ limitations under the License.
 package main
 
 import (
+	"context"
 	"fmt"
 	"os"
 	"time"
@@ -62,7 +63,7 @@ func waitForLeader(clientset *kubernetes.Clientset, namespace string, identity s
 		RenewDeadline: renewDeadline,
 		RetryPeriod:   retryPeriod,
 		Callbacks: leaderelection.LeaderCallbacks{
-			OnStartedLeading: func(stop <-chan struct{}) {
+			OnStartedLeading: func(ctx context.Context) {
 				glog.V(2).Info("Became leader, starting")
 				close(elected)
 			},
@@ -76,7 +77,7 @@ func waitForLeader(clientset *kubernetes.Clientset, namespace string, identity s
 		},
 	}
 
-	go leaderelection.RunOrDie(leaderConfig)
+	go leaderelection.RunOrDie(context.TODO(), leaderConfig)
 
 	// wait for being elected
 	<-elected

diff --git a/vendor/github.com/google/btree/.travis.yml b/vendor/github.com/google/btree/.travis.yml
diff --git a/vendor/github.com/google/btree/LICENSE b/vendor/github.com/google/btree/LICENSE
diff --git a/vendor/github.com/google/btree/README.md b/vendor/github.com/google/btree/README.md