Merge pull request #1279 from SUSE/k8s_1.16_backport

Update Kubernetes to 1.18.6
SUSE · Jul 24, 2020 · 9e1ded0 · 9e1ded0
2 parents 5eb6c25 + b823f7a
commit 9e1ded0
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 112 deletions.
diff --git a/ci/infra/testrunner/tests/utils.py b/ci/infra/testrunner/tests/utils.py
@@ -3,7 +3,7 @@
 import yaml
 
 PREVIOUS_VERSION = "1.17.9"
-CURRENT_VERSION = "1.18.5"
+CURRENT_VERSION = "1.18.6"
 
 
 def check_nodes_ready(kubectl):

diff --git a/go.mod b/go.mod
@@ -9,38 +9,38 @@ require (
  golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975
  golang.org/x/net v0.0.0-20191004110552-13f9640d40b9
  golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
- k8s.io/api v0.18.5
- k8s.io/apimachinery v0.18.5
- k8s.io/client-go v0.18.5
- k8s.io/cluster-bootstrap v0.18.5
+ k8s.io/api v0.18.6
+ k8s.io/apimachinery v0.18.6
+ k8s.io/client-go v0.18.6
+ k8s.io/cluster-bootstrap v0.18.6
  k8s.io/klog v1.0.0
- k8s.io/kubectl v0.18.5
- k8s.io/kubernetes v1.18.5
+ k8s.io/kubectl v0.18.6
+ k8s.io/kubernetes v1.18.6
  sigs.k8s.io/yaml v1.2.0
 )
 
 replace (
- k8s.io/api => k8s.io/api v0.18.5
- k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.18.5
- k8s.io/apimachinery => k8s.io/apimachinery v0.18.5
- k8s.io/apiserver => k8s.io/apiserver v0.18.5
- k8s.io/cli-runtime => k8s.io/cli-runtime v0.18.5
- k8s.io/client-go => k8s.io/client-go v0.18.5
- k8s.io/cloud-provider => k8s.io/cloud-provider v0.18.5
- k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.18.5
- k8s.io/code-generator => k8s.io/code-generator v0.18.5
- k8s.io/component-base => k8s.io/component-base v0.18.5
- k8s.io/cri-api => k8s.io/cri-api v0.18.5
- k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.18.5
- k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.18.5
- k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.18.5
- k8s.io/kube-proxy => k8s.io/kube-proxy v0.18.5
- k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.18.5
- k8s.io/kubectl => k8s.io/kubectl v0.18.5
- k8s.io/kubelet => k8s.io/kubelet v0.18.5
- k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.18.5
- k8s.io/metrics => k8s.io/metrics v0.18.5
- k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.18.5
+ k8s.io/api => k8s.io/api v0.18.6
+ k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.18.6
+ k8s.io/apimachinery => k8s.io/apimachinery v0.18.6
+ k8s.io/apiserver => k8s.io/apiserver v0.18.6
+ k8s.io/cli-runtime => k8s.io/cli-runtime v0.18.6
+ k8s.io/client-go => k8s.io/client-go v0.18.6
+ k8s.io/cloud-provider => k8s.io/cloud-provider v0.18.6
+ k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.18.6
+ k8s.io/code-generator => k8s.io/code-generator v0.18.6
+ k8s.io/component-base => k8s.io/component-base v0.18.6
+ k8s.io/cri-api => k8s.io/cri-api v0.18.6
+ k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.18.6
+ k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.18.6
+ k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.18.6
+ k8s.io/kube-proxy => k8s.io/kube-proxy v0.18.6
+ k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.18.6
+ k8s.io/kubectl => k8s.io/kubectl v0.18.6
+ k8s.io/kubelet => k8s.io/kubelet v0.18.6
+ k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.18.6
+ k8s.io/metrics => k8s.io/metrics v0.18.6
+ k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.18.6
 )
 
 go 1.13