Update k8s dependency to v1.16 (#2828)

argoproj · Dec 11, 2019 · 0ea0404 · 0ea0404
1 parent 0fa02b0
commit 0ea0404
Show file tree

Hide file tree

Showing 37 changed files with 11,504 additions and 10,665 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -54,12 +54,13 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          keys: [codegen-v2]
+          keys:
+            - codegen-v1-{{ checksum "Gopkg.lock" }}-{{ checksum "hack/installers/install-codegen-go-tools.sh" }}
       - run: ./hack/install.sh codegen-go-tools
       - run: sudo ./hack/install.sh codegen-tools
-      - run: dep ensure
+      - run: dep ensure -v
       - save_cache:
-          key: codegen-v2
+          key: codegen-v1-{{ checksum "Gopkg.lock" }}-{{ checksum "hack/installers/install-codegen-go-tools.sh" }}
           paths: [vendor, /tmp/dl, /go/pkg]
       - run: helm init --client-only
       - run: make codegen-local
@@ -92,7 +93,7 @@ jobs:
       - configure_git
       - run: go get github.com/jstemmer/go-junit-report
       - restore_vendor
-      - run: dep ensure
+      - run: dep ensure -v
       - run: make test
       - save_vendor
       - save_go_cache
@@ -134,7 +135,7 @@ jobs:
           key: e2e-dl-v10
           paths: [/tmp/dl]
       - restore_vendor
-      - run: dep ensure
+      - run: dep ensure -v
       - configure_git
       - run: make cli
       - run:

diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -19,7 +19,7 @@ required = [
 
 [[constraint]]
   name = "github.com/gogo/protobuf"
-  version = "1.1.1"
+  version = "1.3.1"
 
 # override github.com/grpc-ecosystem/go-grpc-middleware's constraint on master
 [[override]]
@@ -36,23 +36,35 @@ required = [
   revision = "7858729281ec582767b20e0d696b6041d995d5e0"
 
 [[override]]
-  branch = "release-1.14"
+  branch = "release-1.16"
   name = "k8s.io/api"
 
 [[override]]
-  branch = "release-1.14"
+  branch = "release-1.16"
   name = "k8s.io/kubernetes"
 
 [[override]]
-  branch = "release-1.14"
+  branch = "release-1.16"
   name = "k8s.io/code-generator"
 
 [[override]]
-  branch = "release-1.14"
+  branch = "release-1.16"
   name = "k8s.io/apimachinery"
 
 [[override]]
-  branch = "release-11.0"
+  branch = "release-1.16"
+  name = "k8s.io/apiextensions-apiserver"
+
+[[override]]
+  branch = "release-1.16"
+  name = "k8s.io/apiserver"
+
+[[override]]
+  branch = "release-1.16"
+  name = "k8s.io/kubectl"
+
+[[override]]
+  branch = "release-13.0"
   name = "k8s.io/client-go"
 
 [[override]]
@@ -82,5 +94,5 @@ required = [
 # TODO: move off of k8s.io/kube-openapi and use controller-tools for CRD spec generation
 # (override argoproj/argo contraint on master)
 [[override]]
-  revision = "411b2483e5034420675ebcdd4a55fc76fe5e55cf"
+  revision = "30be4d16710ac61bce31eb28a01054596fe6a9f1"
   name = "k8s.io/kube-openapi"
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.3.0
+1.4.0