Merge pull request #1727 from hongchaodeng/dep

dep: update etcd 3.2.16, kubernetes 1.10.0, k8s codegen 1.10
coreos · Mar 12, 2018 · 9251d93 · 9251d93
2 parents a3e0da0 + 8c4e327
commit 9251d93
Show file tree

Hide file tree

Showing 35 changed files with 331 additions and 362 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -1,46 +1,50 @@
 [[constraint]]
   name = "k8s.io/api"
-  version = "kubernetes-1.8.2"
+  version = "kubernetes-1.10.0-beta.2"
 
 [[constraint]]
   name = "k8s.io/apiextensions-apiserver"
-  version = "kubernetes-1.8.2"
+  version = "kubernetes-1.10.0-beta.2"
 
 [[constraint]]
   name = "k8s.io/apimachinery"
-  version = "kubernetes-1.8.2"
+  version = "kubernetes-1.10.0-beta.2"
 
 [[constraint]]
   name = "k8s.io/client-go"
-  version = "kubernetes-1.8.2"
+  version = "kubernetes-1.10.0-beta.2"
 
 [[constraint]]
   name = "github.com/coreos/etcd"
-  version = "=3.1.9"
+  version = "=3.2.16"
+
+[[override]]
+  name = "google.golang.org/grpc"
+  version = "=1.7.5"
 
 [[constraint]]
   name = "github.com/aws/aws-sdk-go"
-  version = "=v1.13.8"
+  version = "=1.13.8"
 
 [[constraint]]
   name = "github.com/pborman/uuid"
-  version = "=v1.1"
+  version = "=1.1"
 
 [[constraint]]
   name = "github.com/pkg/errors"
-  version = "=v0.8.0"
+  version = "=0.8.0"
 
 [[constraint]]
   name = "github.com/prometheus/client_golang"
-  version = "=v0.8.0"
+  version = "=0.8.0"
 
 [[constraint]]
   name = "github.com/sirupsen/logrus"
-  version = "=v1.0.4"
+  version = "=1.0.4"
 
 [[constraint]]
   name = "golang.org/x/time"
 
 [[constraint]]
   name = "github.com/Azure/azure-sdk-for-go"
-  version = "=v11.3.0-beta"
+  version = "=11.3.0-beta"
diff --git a/hack/k8s/codegen/update-generated.sh b/hack/k8s/codegen/update-generated.sh
@@ -5,7 +5,7 @@ set -o nounset
 set -o pipefail
 
 DOCKER_REPO_ROOT="/go/src/github.com/coreos/etcd-operator"
-IMAGE=${IMAGE:-"gcr.io/coreos-k8s-scale-testing/codegen"}
+IMAGE=${IMAGE:-"gcr.io/coreos-k8s-scale-testing/codegen:1.10"}
 
 docker run --rm \
   -v "$PWD":"$DOCKER_REPO_ROOT" \

diff --git a/pkg/apis/etcd/v1beta2/zz_generated.deepcopy.go b/pkg/apis/etcd/v1beta2/zz_generated.deepcopy.go
diff --git a/pkg/generated/clientset/versioned/clientset.go b/pkg/generated/clientset/versioned/clientset.go
diff --git a/pkg/generated/clientset/versioned/doc.go b/pkg/generated/clientset/versioned/doc.go
diff --git a/pkg/generated/clientset/versioned/fake/clientset_generated.go b/pkg/generated/clientset/versioned/fake/clientset_generated.go
diff --git a/pkg/generated/clientset/versioned/fake/doc.go b/pkg/generated/clientset/versioned/fake/doc.go
diff --git a/pkg/generated/clientset/versioned/fake/register.go b/pkg/generated/clientset/versioned/fake/register.go
diff --git a/pkg/generated/clientset/versioned/scheme/doc.go b/pkg/generated/clientset/versioned/scheme/doc.go
diff --git a/pkg/generated/clientset/versioned/scheme/register.go b/pkg/generated/clientset/versioned/scheme/register.go
diff --git a/pkg/generated/clientset/versioned/typed/etcd/v1beta2/doc.go b/pkg/generated/clientset/versioned/typed/etcd/v1beta2/doc.go