Skip to content

Commit

Permalink
Merge pull request #1444 from wgahnagl/release-4.11-submodule-update-…
Browse files Browse the repository at this point in the history
…03-01

[release-4.11][submodule] submodule update 03/01
  • Loading branch information
openshift-merge-robot committed Mar 2, 2023
2 parents d033048 + 721827e commit bc6ce07
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ WMCO_VERSION ?= 6.0.1

# *_GIT_VERSION are the k8s versions. Any update to the build line could potentially require an update to the sed
# command in generate_k8s_version_commit() in hack/update_submodules.sh
KUBELET_GIT_VERSION=v1.24.0+feedbee
KUBE-PROXY_GIT_VERSION=v1.24.0+feedbee
KUBELET_GIT_VERSION=v1.24.6+deccab3
KUBE-PROXY_GIT_VERSION=v1.24.0+041f707

# CHANNELS define the bundle channels used in the bundle.
# Add a new line here if you would like to change its default config. (E.g CHANNELS = "preview,fast,stable")
Expand Down
2 changes: 1 addition & 1 deletion containerd
Submodule containerd updated 45 files
+1 −1 .github/workflows/build-test-images.yml
+10 −9 .github/workflows/ci.yml
+2 −2 .github/workflows/codeql.yml
+1 −1 .github/workflows/images.yml
+1 −1 .github/workflows/nightly.yml
+1 −1 .github/workflows/release.yml
+1 −1 Vagrantfile
+1 −1 api/services/content/v1/content.pb.go
+8 −3 cmd/ctr/commands/run/run.go
+1 −1 contrib/Dockerfile.test
+18 −0 docs/hosts.md
+1 −1 go.mod
+2 −2 go.sum
+7 −5 images/archive/importer.go
+91 −41 integration/addition_gids_test.go
+1 −1 integration/client/go.mod
+2 −2 integration/client/go.sum
+39 −0 integration/main_test.go
+103 −37 oci/spec_opts.go
+269 −0 oci/spec_opts_linux_test.go
+6 −6 pkg/apparmor/apparmor.go
+6 −4 pkg/apparmor/apparmor_linux.go
+8 −0 pkg/cri/server/cni_conf_syncer.go
+2 −1 pkg/cri/server/container_create_linux.go
+2 −72 pkg/cri/server/image_pull.go
+0 −50 pkg/cri/server/image_pull_test.go
+16 −0 pkg/cri/server/metrics.go
+4 −0 pkg/cri/server/sandbox_run.go
+9 −1 pkg/cri/server/sandbox_stop.go
+10 −2 pkg/cri/server/update_runtime_config.go
+97 −0 pkg/snapshotters/annotations.go
+74 −0 pkg/snapshotters/annotations_test.go
+8 −4 platforms/defaults_windows.go
+2 −2 platforms/defaults_windows_test.go
+14 −0 platforms/platforms_windows_test.go
+23 −0 releases/v1.6.17.toml
+24 −0 releases/v1.6.18.toml
+20 −0 releases/v1.6.19.toml
+8 −6 remotes/docker/config/config_unix.go
+8 −6 remotes/docker/config/config_windows.go
+1 −1 script/setup/prepare_env_windows.ps1
+11 −3 snapshots/devmapper/pool_device.go
+35 −3 vendor/github.com/Microsoft/hcsshim/internal/hcs/process.go
+1 −1 vendor/modules.txt
+1 −1 version/version.go

0 comments on commit bc6ce07

Please sign in to comment.