Skip to content

Commit e4d8ba8

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #701 from saschagrunert/k8s-1.20
Update Kubernetes to v1.20.0
2 parents 096f2bf + e45d9e7 commit e4d8ba8

File tree

819 files changed

+272875
-5257
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

819 files changed

+272875
-5257
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ See the [roadmap](docs/roadmap.md) for information about current and future mile
4141
### Install crictl
4242

4343
```sh
44-
VERSION="v1.19.0"
44+
VERSION="v1.20.0"
4545
wget https://github.com/kubernetes-sigs/cri-tools/releases/download/$VERSION/crictl-$VERSION-linux-amd64.tar.gz
4646
sudo tar zxvf crictl-$VERSION-linux-amd64.tar.gz -C /usr/local/bin
4747
rm -f crictl-$VERSION-linux-amd64.tar.gz
@@ -50,7 +50,7 @@ rm -f crictl-$VERSION-linux-amd64.tar.gz
5050
### Install critest
5151

5252
```sh
53-
VERSION="v1.19.0"
53+
VERSION="v1.20.0"
5454
wget https://github.com/kubernetes-sigs/cri-tools/releases/download/$VERSION/critest-$VERSION-linux-amd64.tar.gz
5555
sudo tar zxvf critest-$VERSION-linux-amd64.tar.gz -C /usr/local/bin
5656
rm -f critest-$VERSION-linux-amd64.tar.gz

‎docs/crictl.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ crictl is currently in Beta and still under quick iterations. It is hosted at th
1111
- using `wget`:
1212

1313
```sh
14-
VERSION="v1.19.0"
14+
VERSION="v1.20.0"
1515
wget https://github.com/kubernetes-sigs/cri-tools/releases/download/$VERSION/crictl-$VERSION-linux-amd64.tar.gz
1616
sudo tar zxvf crictl-$VERSION-linux-amd64.tar.gz -C /usr/local/bin
1717
rm -f crictl-$VERSION-linux-amd64.tar.gz
@@ -20,7 +20,7 @@ rm -f crictl-$VERSION-linux-amd64.tar.gz
2020
- using `curl`:
2121

2222
```sh
23-
VERSION="v1.19.0"
23+
VERSION="v1.20.0"
2424
curl -L https://github.com/kubernetes-sigs/cri-tools/releases/download/$VERSION/crictl-${VERSION}-linux-amd64.tar.gz --output crictl-${VERSION}-linux-amd64.tar.gz
2525
sudo tar zxvf crictl-$VERSION-linux-amd64.tar.gz -C /usr/local/bin
2626
rm -f crictl-$VERSION-linux-amd64.tar.gz

‎go.mod‎

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ require (
1616
github.com/pkg/errors v0.9.1
1717
github.com/sirupsen/logrus v1.7.0
1818
github.com/urfave/cli/v2 v2.3.0
19-
golang.org/x/net v0.0.0-20201031054903-ff519b6c9102
20-
golang.org/x/sys v0.0.0-20201107080550-4d91cf3a1aaf
19+
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
20+
golang.org/x/sys v0.0.0-20201112073958-5cba982894dd
2121
google.golang.org/grpc v1.33.2
2222
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776
2323
k8s.io/api v0.0.0
@@ -30,26 +30,29 @@ require (
3030
)
3131

3232
replace (
33-
k8s.io/api => k8s.io/kubernetes/staging/src/k8s.io/api v0.0.0-20200826142205-e19964183377
34-
k8s.io/apiextensions-apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20200826142205-e19964183377
35-
k8s.io/apimachinery => k8s.io/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20200826142205-e19964183377
36-
k8s.io/apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20200826142205-e19964183377
37-
k8s.io/cli-runtime => k8s.io/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20200826142205-e19964183377
38-
k8s.io/client-go => k8s.io/kubernetes/staging/src/k8s.io/client-go v0.0.0-20200826142205-e19964183377
39-
k8s.io/cloud-provider => k8s.io/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20200826142205-e19964183377
40-
k8s.io/cluster-bootstrap => k8s.io/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20200826142205-e19964183377
41-
k8s.io/code-generator => k8s.io/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20200826142205-e19964183377
42-
k8s.io/component-base => k8s.io/kubernetes/staging/src/k8s.io/component-base v0.0.0-20200826142205-e19964183377
43-
k8s.io/cri-api => k8s.io/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20200826142205-e19964183377
44-
k8s.io/csi-translation-lib => k8s.io/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20200826142205-e19964183377
45-
k8s.io/kube-aggregator => k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20200826142205-e19964183377
46-
k8s.io/kube-controller-manager => k8s.io/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20200826142205-e19964183377
47-
k8s.io/kube-proxy => k8s.io/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20200826142205-e19964183377
48-
k8s.io/kube-scheduler => k8s.io/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20200826142205-e19964183377
49-
k8s.io/kubectl => k8s.io/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20200826142205-e19964183377
50-
k8s.io/kubelet => k8s.io/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20200826142205-e19964183377
51-
k8s.io/kubernetes => k8s.io/kubernetes v1.19.0
52-
k8s.io/legacy-cloud-providers => k8s.io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20200826142205-e19964183377
53-
k8s.io/metrics => k8s.io/kubernetes/staging/src/k8s.io/metrics v0.0.0-20200826142205-e19964183377
54-
k8s.io/sample-apiserver => k8s.io/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20200826142205-e19964183377
33+
k8s.io/api => k8s.io/kubernetes/staging/src/k8s.io/api v0.0.0-20201204214525-af46c47ce925
34+
k8s.io/apiextensions-apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20201204214525-af46c47ce925
35+
k8s.io/apimachinery => k8s.io/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20201204214525-af46c47ce925
36+
k8s.io/apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20201204214525-af46c47ce925
37+
k8s.io/cli-runtime => k8s.io/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20201204214525-af46c47ce925
38+
k8s.io/client-go => k8s.io/kubernetes/staging/src/k8s.io/client-go v0.0.0-20201204214525-af46c47ce925
39+
k8s.io/cloud-provider => k8s.io/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20201204214525-af46c47ce925
40+
k8s.io/cluster-bootstrap => k8s.io/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20201204214525-af46c47ce925
41+
k8s.io/code-generator => k8s.io/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20201204214525-af46c47ce925
42+
k8s.io/component-base => k8s.io/kubernetes/staging/src/k8s.io/component-base v0.0.0-20201204214525-af46c47ce925
43+
k8s.io/component-helpers => k8s.io/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20201204214525-af46c47ce925
44+
k8s.io/controller-manager => k8s.io/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20201204214525-af46c47ce925
45+
k8s.io/cri-api => k8s.io/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20201204214525-af46c47ce925
46+
k8s.io/csi-translation-lib => k8s.io/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20201204214525-af46c47ce925
47+
k8s.io/kube-aggregator => k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20201204214525-af46c47ce925
48+
k8s.io/kube-controller-manager => k8s.io/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20201204214525-af46c47ce925
49+
k8s.io/kube-proxy => k8s.io/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20201204214525-af46c47ce925
50+
k8s.io/kube-scheduler => k8s.io/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20201204214525-af46c47ce925
51+
k8s.io/kubectl => k8s.io/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20201204214525-af46c47ce925
52+
k8s.io/kubelet => k8s.io/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20201204214525-af46c47ce925
53+
k8s.io/kubernetes => k8s.io/kubernetes v1.20.0
54+
k8s.io/legacy-cloud-providers => k8s.io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20201204214525-af46c47ce925
55+
k8s.io/metrics => k8s.io/kubernetes/staging/src/k8s.io/metrics v0.0.0-20201204214525-af46c47ce925
56+
k8s.io/mount-utils => k8s.io/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20201204214525-af46c47ce925
57+
k8s.io/sample-apiserver => k8s.io/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20201204214525-af46c47ce925
5558
)

0 commit comments

Comments
 (0)