Skip to content

Commit d82b602

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #808 from saschagrunert/k8s-bump
Bump Kubernetes to v1.22.0
2 parents 353e287 + 3db8a88 commit d82b602

File tree

496 files changed

+24842
-22628
lines changed

Some content is hidden

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

496 files changed

+24842
-22628
lines changed

‎.github/workflows/dockershim.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: Install Go
1515
uses: actions/setup-go@v2
1616
with:
17-
go-version: '1.15'
17+
go-version: '1.16'
1818

1919
- name: Set Go binary path
2020
shell: bash
@@ -72,9 +72,10 @@ jobs:
7272
7373
git clone https://github.com/Mirantis/cri-dockerd $GOPATH/src/github.com/Mirantis/cri-dockerd
7474
cd $GOPATH/src/github.com/Mirantis/cri-dockerd
75+
go mod tidy
7576
7677
# Need the flag for errors building on Windows
77-
# Ref: https://github.com/golang/go/issues/30674
78+
# Ref: https://github.com/golang/go/issues/30674
7879
# https://github.com/golang/go/issues/40795
7980
go install -buildmode=exe .
8081
mv $GOPATH/bin/cri-dockerd.exe /usr/local/bin

‎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.21.0"
44+
VERSION="v1.22.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.21.0"
53+
VERSION="v1.22.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.21.0"
14+
VERSION="v1.22.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.21.0"
23+
VERSION="v1.22.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: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -11,48 +11,50 @@ require (
1111
github.com/onsi/ginkgo v1.16.4
1212
github.com/onsi/gomega v1.14.0
1313
github.com/opencontainers/go-digest v1.0.0
14+
github.com/opencontainers/runc v1.0.1
1415
github.com/opencontainers/selinux v1.8.3
1516
github.com/pborman/uuid v1.2.1
1617
github.com/pkg/errors v0.9.1
1718
github.com/sirupsen/logrus v1.8.1
1819
github.com/urfave/cli/v2 v2.3.0
19-
golang.org/x/net v0.0.0-20210428140749-89ef3d95e781
20-
golang.org/x/sys v0.0.0-20210423082822-04245dca01da
20+
golang.org/x/net v0.0.0-20210520170846-37e1c6afe023
21+
golang.org/x/sys v0.0.0-20210616094352-59db8d763f22
2122
google.golang.org/grpc v1.39.0
2223
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
2324
k8s.io/api v0.22.0
2425
k8s.io/apimachinery v0.22.0
25-
k8s.io/client-go v1.5.2
26+
k8s.io/client-go v0.22.0
2627
k8s.io/cri-api v0.22.0
2728
k8s.io/kubectl v0.22.0
2829
k8s.io/kubernetes v0.21.4
2930
sigs.k8s.io/yaml v1.2.0
3031
)
3132

3233
replace (
33-
k8s.io/api => k8s.io/kubernetes/staging/src/k8s.io/api v0.0.0-20210408162405-cb303e613a12
34-
k8s.io/apiextensions-apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20210408162405-cb303e613a12
35-
k8s.io/apimachinery => k8s.io/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20210408162405-cb303e613a12
36-
k8s.io/apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20210408162405-cb303e613a12
37-
k8s.io/cli-runtime => k8s.io/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20210408162405-cb303e613a12
38-
k8s.io/client-go => k8s.io/kubernetes/staging/src/k8s.io/client-go v0.0.0-20210408162405-cb303e613a12
39-
k8s.io/cloud-provider => k8s.io/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20210408162405-cb303e613a12
40-
k8s.io/cluster-bootstrap => k8s.io/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20210408162405-cb303e613a12
41-
k8s.io/code-generator => k8s.io/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20210408162405-cb303e613a12
42-
k8s.io/component-base => k8s.io/kubernetes/staging/src/k8s.io/component-base v0.0.0-20210408162405-cb303e613a12
43-
k8s.io/component-helpers => k8s.io/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20210408162405-cb303e613a12
44-
k8s.io/controller-manager => k8s.io/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20210408162405-cb303e613a12
45-
k8s.io/cri-api => k8s.io/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20210408162405-cb303e613a12
46-
k8s.io/csi-translation-lib => k8s.io/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20210408162405-cb303e613a12
47-
k8s.io/kube-aggregator => k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20210408162405-cb303e613a12
48-
k8s.io/kube-controller-manager => k8s.io/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20210408162405-cb303e613a12
49-
k8s.io/kube-proxy => k8s.io/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20210408162405-cb303e613a12
50-
k8s.io/kube-scheduler => k8s.io/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20210408162405-cb303e613a12
51-
k8s.io/kubectl => k8s.io/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20210408162405-cb303e613a12
52-
k8s.io/kubelet => k8s.io/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20210408162405-cb303e613a12
53-
k8s.io/kubernetes => k8s.io/kubernetes v1.21.0
54-
k8s.io/legacy-cloud-providers => k8s.io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20210408162405-cb303e613a12
55-
k8s.io/metrics => k8s.io/kubernetes/staging/src/k8s.io/metrics v0.0.0-20210408162405-cb303e613a12
56-
k8s.io/mount-utils => k8s.io/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20210408162405-cb303e613a12
57-
k8s.io/sample-apiserver => k8s.io/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20210408162405-cb303e613a12
34+
k8s.io/api => k8s.io/kubernetes/staging/src/k8s.io/api v0.0.0-20210804175619-c2b5237ccd9c
35+
k8s.io/apiextensions-apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20210804175619-c2b5237ccd9c
36+
k8s.io/apimachinery => k8s.io/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20210804175619-c2b5237ccd9c
37+
k8s.io/apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20210804175619-c2b5237ccd9c
38+
k8s.io/cli-runtime => k8s.io/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20210804175619-c2b5237ccd9c
39+
k8s.io/client-go => k8s.io/kubernetes/staging/src/k8s.io/client-go v0.0.0-20210804175619-c2b5237ccd9c
40+
k8s.io/cloud-provider => k8s.io/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20210804175619-c2b5237ccd9c
41+
k8s.io/cluster-bootstrap => k8s.io/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20210804175619-c2b5237ccd9c
42+
k8s.io/code-generator => k8s.io/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20210804175619-c2b5237ccd9c
43+
k8s.io/component-base => k8s.io/kubernetes/staging/src/k8s.io/component-base v0.0.0-20210804175619-c2b5237ccd9c
44+
k8s.io/component-helpers => k8s.io/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20210804175619-c2b5237ccd9c
45+
k8s.io/controller-manager => k8s.io/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20210804175619-c2b5237ccd9c
46+
k8s.io/cri-api => k8s.io/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20210804175619-c2b5237ccd9c
47+
k8s.io/csi-translation-lib => k8s.io/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20210804175619-c2b5237ccd9c
48+
k8s.io/kube-aggregator => k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20210804175619-c2b5237ccd9c
49+
k8s.io/kube-controller-manager => k8s.io/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20210804175619-c2b5237ccd9c
50+
k8s.io/kube-proxy => k8s.io/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20210804175619-c2b5237ccd9c
51+
k8s.io/kube-scheduler => k8s.io/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20210804175619-c2b5237ccd9c
52+
k8s.io/kubectl => k8s.io/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20210804175619-c2b5237ccd9c
53+
k8s.io/kubelet => k8s.io/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20210804175619-c2b5237ccd9c
54+
k8s.io/kubernetes => k8s.io/kubernetes v1.22.0
55+
k8s.io/legacy-cloud-providers => k8s.io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20210804175619-c2b5237ccd9c
56+
k8s.io/metrics => k8s.io/kubernetes/staging/src/k8s.io/metrics v0.0.0-20210804175619-c2b5237ccd9c
57+
k8s.io/mount-utils => k8s.io/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20210804175619-c2b5237ccd9c
58+
k8s.io/pod-security-admission => k8s.io/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20210804175619-c2b5237ccd9c
59+
k8s.io/sample-apiserver => k8s.io/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20210804175619-c2b5237ccd9c
5860
)

0 commit comments

Comments
 (0)