k8s: update k8s dependencies to 1.16.15

Also update k8s testing versions to 1.16.15 Signed-off-by: André Martins <andre@cilium.io>
cilium · Sep 8, 2020 · 3be242c · 3be242c
1 parent 2035ba3
commit 3be242c
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 27 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -514,39 +514,39 @@ required = [
 
 [[constraint]]
   name = "k8s.io/api"
-  revision = "kubernetes-1.16.12"
+  revision = "kubernetes-1.16.15"
 
   # main-usage = "pkg/k8s"
   # on-revision = ""
 
 [[constraint]]
   name = "k8s.io/apiextensions-apiserver"
-  revision = "kubernetes-1.16.12"
+  revision = "kubernetes-1.16.15"
 
   # main-usage = "pkg/k8s"
   # on-revision = ""
 
 [[override]]
   name = "k8s.io/apiserver"
-  revision = "kubernetes-1.16.12"
+  revision = "kubernetes-1.16.15"
 
   # main-usage = "pkg/k8s"
   # on-revision = ""
 
 [[constraint]]
   name = "k8s.io/apimachinery"
-  revision = "kubernetes-1.16.12"
+  revision = "kubernetes-1.16.15"
 
   # main-usage = "pkg/k8s"
   # on-revision = ""
 
 [[constraint]]
   name = "k8s.io/client-go"
   source = "https://github.com/cilium/client-go"
-  revision = "db9e84cc70f6cc2db0081b4cecc0e4e4f3df4c27"
+  revision = "04c46fc588a85d6d380db9858bc281f29efece46"
 
   # main-usage = "pkg/k8s"
-  # on-revision = "TODO @aanm is on 4e53353d513604b5f88d2f1e68d3ee03ea9def4f as it contains the hotfix for the metrics path"
+  # on-revision = "TODO @aanm is on 04c46fc588a85d6d380db9858bc281f29efece46 as it contains the hotfix for the metrics path"
 
 [[override]]
   name = "k8s.io/utils"
@@ -557,7 +557,7 @@ required = [
 
 [[constraint]]
   name = "k8s.io/code-generator"
-  revision = "kubernetes-1.16.12"
+  revision = "kubernetes-1.16.15"
 
   # main-usage = "pkg/k8s"
   # on-revision = ""
@@ -571,14 +571,14 @@ required = [
 
 [[constraint]]
   name = "k8s.io/kubernetes"
-  revision = "v1.16.11"
+  revision = "v1.16.15"
 
   # main-usage = "pkg/k8s"
   # on-revision = ""
 
 [[constraint]]
   name = "k8s.io/cri-api"
-  revision = "kubernetes-1.16.12"
+  revision = "kubernetes-1.16.15"
 
   # main-usage = "pkg/workloads"
   # on-revision = ""

diff --git a/test/provision/k8s_install.sh b/test/provision/k8s_install.sh
@@ -17,7 +17,7 @@ CONTAINER_RUNTIME=$5
 CNI_INTEGRATION=$6
 # Pinned to the last version of k8s 1.16 branch so we can do
 # kubectl apply on older k8s test frameworks
-K8S_KUBECTL_APPLY_FORCE="1.16.12"
+K8S_KUBECTL_APPLY_FORCE="1.16.15"
 
 # Kubeadm default parameters
 export KUBEADM_ADDR='192.168.36.11'

diff --git a/vendor/k8s.io/apimachinery/pkg/util/net/http.go b/vendor/k8s.io/apimachinery/pkg/util/net/http.go
diff --git a/vendor/k8s.io/kubernetes/Godeps/LICENSES b/vendor/k8s.io/kubernetes/Godeps/LICENSES
diff --git a/vendor/k8s.io/kubernetes/pkg/apis/core/types.go b/vendor/k8s.io/kubernetes/pkg/apis/core/types.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/types/constants.go b/vendor/k8s.io/kubernetes/pkg/kubelet/types/constants.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/types/types.go b/vendor/k8s.io/kubernetes/pkg/kubelet/types/types.go