Skip to content

Commit 7fbf54b

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request cri-o#6487 from haircommander/bump-kube-1.26
Bump kube and cri-tools to 1.26
2 parents a8c9ddc + 752bf4d commit 7fbf54b

File tree

477 files changed

+58129
-7088
lines changed

Some content is hidden

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

477 files changed

+58129
-7088
lines changed

‎contrib/test/ci/cri-o.spec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
%if ! 0%{?centos} && 0%{?rhel}
1515
# Golang minor version
16-
%global gominver 18
16+
%global gominver 19
1717
%define gobuild(o:) scl enable go-toolset-1.%{gominver} -- go build -buildmode pie -compiler gc -tags="rpm_crashtraceback no_openssl ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v -x %{?**};
1818
%else
1919
%define gobuild(o:) go build -buildmode pie -compiler gc -tags="rpm_crashtraceback no_openssl ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v -x %{?**};
@@ -32,7 +32,7 @@
3232
%global service_name crio
3333

3434
Name: %{repo}
35-
Version: 1.24.0
35+
Version: 1.26.0
3636
Release: 1.ci%{?dist}
3737
Summary: Kubernetes Container Runtime Interface for OCI-based containers
3838
License: ASL 2.0

‎contrib/test/ci/vars.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ cgroupv2: False
1313
use_conmonrs: '{{ USE_CONMONRS | default(False) | bool }}'
1414

1515
critest_mirror_repo: quay.io/crio
16-
cri_tools_git_version: "v1.25.0"
16+
cri_tools_git_version: "v1.26.0"
1717
golang_version: "1.19"
1818

1919
# For results.yml Paths use rsync 'source' conventions

‎contrib/test/integration/vars.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ build_kata: False
1212
cgroupv2: False
1313

1414
critest_mirror_repo: quay.io/crio
15-
cri_tools_git_version: "v1.25.0"
15+
cri_tools_git_version: "v1.26.0"
1616
golang_version: "1.19"
1717

1818
# For results.yml Paths use rsync 'source' conventions

‎dependencies.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ dependencies:
4242
match: conmon
4343

4444
- name: cri-tools
45-
version: v1.25.0
45+
version: v1.26.0
4646
refPaths:
4747
- path: scripts/versions
4848
match: cri-tools

‎go.mod‎

Lines changed: 39 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -69,19 +69,19 @@ require (
6969
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.11.1
7070
go.opentelemetry.io/otel/sdk v1.11.1
7171
go.opentelemetry.io/otel/trace v1.11.1
72-
golang.org/x/net v0.3.0
72+
golang.org/x/net v0.3.1-0.20221206200815-1e63c2f08a10
7373
golang.org/x/sync v0.1.0
7474
golang.org/x/sys v0.3.0
7575
google.golang.org/grpc v1.51.0
7676
google.golang.org/protobuf v1.28.1
77-
k8s.io/api v0.25.0
78-
k8s.io/apimachinery v0.25.0
77+
k8s.io/api v0.26.0
78+
k8s.io/apimachinery v0.26.0
7979
k8s.io/client-go v1.5.2
8080
k8s.io/cri-api v0.25.3
8181
k8s.io/klog/v2 v2.80.1
82-
k8s.io/kubernetes v1.24.1
82+
k8s.io/kubernetes v1.26.0
8383
k8s.io/release v0.14.0
84-
k8s.io/utils v0.0.0-20221012122500-cfd413dd9e85
84+
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d
8585
mvdan.cc/sh/v3 v3.5.1
8686
sigs.k8s.io/bom v0.4.1
8787
sigs.k8s.io/release-sdk v0.9.3
@@ -171,7 +171,7 @@ require (
171171
github.com/docker/go-metrics v0.0.1 // indirect
172172
github.com/docker/go-plugins-helpers v0.0.0-20211224144127-6eecb7beb651 // indirect
173173
github.com/dustin/go-humanize v1.0.0 // indirect
174-
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
174+
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
175175
github.com/emicklei/proto v1.6.15 // indirect
176176
github.com/emirpasic/gods v1.12.0 // indirect
177177
github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1 // indirect
@@ -273,7 +273,7 @@ require (
273273
github.com/moby/sys/mount v0.3.3 // indirect
274274
github.com/moby/sys/mountinfo v0.6.2 // indirect
275275
github.com/moby/sys/sequential v0.0.0-20220829095930-b22ba8a69b30 // indirect
276-
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
276+
github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae // indirect
277277
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
278278
github.com/modern-go/reflect2 v1.0.2 // indirect
279279
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
@@ -399,12 +399,12 @@ require (
399399
gopkg.in/yaml.v2 v2.4.0 // indirect
400400
gopkg.in/yaml.v3 v3.0.1 // indirect
401401
helm.sh/helm/v3 v3.10.0 // indirect
402-
k8s.io/apiserver v0.25.0 // indirect
403-
k8s.io/cli-runtime v0.25.0 // indirect
402+
k8s.io/apiserver v0.26.0 // indirect
403+
k8s.io/cli-runtime v0.26.0 // indirect
404404
k8s.io/cloud-provider v0.0.0 // indirect
405-
k8s.io/component-base v0.25.0 // indirect
405+
k8s.io/component-base v0.26.0 // indirect
406406
k8s.io/component-helpers v0.0.0 // indirect
407-
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
407+
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
408408
k8s.io/mount-utils v0.0.0 // indirect
409409
mvdan.cc/editorconfig v0.2.0 // indirect
410410
oras.land/oras-go v1.2.0 // indirect
@@ -421,30 +421,32 @@ replace (
421421
// https://github.com/containers/podman/blob/74aa681e59352257eb5f25f089dffa66d6345a3a/go.mod#L78
422422
github.com/opencontainers/runc => github.com/opencontainers/runc v1.1.1-0.20220617142545-8b9452f75cbc
423423
github.com/u-root/u-root => github.com/u-root/u-root v0.8.1-0.20220307150114-d511ded1d944
424-
k8s.io/api => k8s.io/kubernetes/staging/src/k8s.io/api v0.0.0-20220823173643-a866cbe2e5bb
425-
k8s.io/apiextensions-apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20220823173643-a866cbe2e5bb
426-
k8s.io/apimachinery => k8s.io/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20220823173643-a866cbe2e5bb
427-
k8s.io/apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20220823173643-a866cbe2e5bb
428-
k8s.io/cli-runtime => k8s.io/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20220823173643-a866cbe2e5bb
429-
k8s.io/client-go => k8s.io/kubernetes/staging/src/k8s.io/client-go v0.0.0-20220823173643-a866cbe2e5bb
430-
k8s.io/cloud-provider => k8s.io/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20220823173643-a866cbe2e5bb
431-
k8s.io/cluster-bootstrap => k8s.io/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20220823173643-a866cbe2e5bb
432-
k8s.io/code-generator => k8s.io/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20220823173643-a866cbe2e5bb
433-
k8s.io/component-base => k8s.io/kubernetes/staging/src/k8s.io/component-base v0.0.0-20220823173643-a866cbe2e5bb
434-
k8s.io/component-helpers => k8s.io/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20220823173643-a866cbe2e5bb
435-
k8s.io/controller-manager => k8s.io/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20220823173643-a866cbe2e5bb
436-
k8s.io/cri-api => k8s.io/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20221108143616-86284d42f891
437-
k8s.io/csi-translation-lib => k8s.io/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20220823173643-a866cbe2e5bb
438-
k8s.io/kube-aggregator => k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20220823173643-a866cbe2e5bb
439-
k8s.io/kube-controller-manager => k8s.io/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20220823173643-a866cbe2e5bb
440-
k8s.io/kube-proxy => k8s.io/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20220823173643-a866cbe2e5bb
441-
k8s.io/kube-scheduler => k8s.io/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20220823173643-a866cbe2e5bb
442-
k8s.io/kubectl => k8s.io/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20220823173643-a866cbe2e5bb
443-
k8s.io/kubelet => k8s.io/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20220823173643-a866cbe2e5bb
444-
k8s.io/kubernetes => k8s.io/kubernetes v1.25.0
445-
k8s.io/legacy-cloud-providers => k8s.io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20220823173643-a866cbe2e5bb
446-
k8s.io/metrics => k8s.io/kubernetes/staging/src/k8s.io/metrics v0.0.0-20220823173643-a866cbe2e5bb
447-
k8s.io/mount-utils => k8s.io/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20220823173643-a866cbe2e5bb
448-
k8s.io/pod-security-admission => k8s.io/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20220823173643-a866cbe2e5bb
449-
k8s.io/sample-apiserver => k8s.io/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20220823173643-a866cbe2e5bb
424+
k8s.io/api => k8s.io/kubernetes/staging/src/k8s.io/api v0.0.0-20221208195143-b46a3f887ca9
425+
k8s.io/apiextensions-apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20221208195143-b46a3f887ca9
426+
k8s.io/apimachinery => k8s.io/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20221208195143-b46a3f887ca9
427+
k8s.io/apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20221208195143-b46a3f887ca9
428+
k8s.io/cli-runtime => k8s.io/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20221208195143-b46a3f887ca9
429+
k8s.io/client-go => k8s.io/kubernetes/staging/src/k8s.io/client-go v0.0.0-20221208195143-b46a3f887ca9
430+
k8s.io/cloud-provider => k8s.io/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20221208195143-b46a3f887ca9
431+
k8s.io/cluster-bootstrap => k8s.io/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20221208195143-b46a3f887ca9
432+
k8s.io/code-generator => k8s.io/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20221208195143-b46a3f887ca9
433+
k8s.io/component-base => k8s.io/kubernetes/staging/src/k8s.io/component-base v0.0.0-20221208195143-b46a3f887ca9
434+
k8s.io/component-helpers => k8s.io/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20221208195143-b46a3f887ca9
435+
k8s.io/controller-manager => k8s.io/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20221208195143-b46a3f887ca9
436+
k8s.io/cri-api => k8s.io/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20221208195143-b46a3f887ca9
437+
k8s.io/csi-translation-lib => k8s.io/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20221208195143-b46a3f887ca9
438+
k8s.io/dynamic-resource-allocation => k8s.io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20221208195143-b46a3f887ca9
439+
k8s.io/kms => k8s.io/kubernetes/staging/src/k8s.io/kms v0.0.0-20221208195143-b46a3f887ca9
440+
k8s.io/kube-aggregator => k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20221208195143-b46a3f887ca9
441+
k8s.io/kube-controller-manager => k8s.io/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20221208195143-b46a3f887ca9
442+
k8s.io/kube-proxy => k8s.io/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20221208195143-b46a3f887ca9
443+
k8s.io/kube-scheduler => k8s.io/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20221208195143-b46a3f887ca9
444+
k8s.io/kubectl => k8s.io/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20221208195143-b46a3f887ca9
445+
k8s.io/kubelet => k8s.io/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20221208195143-b46a3f887ca9
446+
k8s.io/kubernetes => k8s.io/kubernetes v1.26.0
447+
k8s.io/legacy-cloud-providers => k8s.io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20221208195143-b46a3f887ca9
448+
k8s.io/metrics => k8s.io/kubernetes/staging/src/k8s.io/metrics v0.0.0-20221208195143-b46a3f887ca9
449+
k8s.io/mount-utils => k8s.io/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20221208195143-b46a3f887ca9
450+
k8s.io/pod-security-admission => k8s.io/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20221208195143-b46a3f887ca9
451+
k8s.io/sample-apiserver => k8s.io/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20221208195143-b46a3f887ca9
450452
)

0 commit comments

Comments
 (0)