summaryrefslogtreecommitdiffstats
path: root/recipes-containers/cri-o/files/0001-Makefile-force-symlinks.patch
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2023-09-05 21:00:27 +0000
committerBruce Ashfield <bruce.ashfield@gmail.com>2023-09-15 17:30:39 +0000
commit5569d658810b26afcf9d8ba0ab8ad5e0cc842347 (patch)
tree5e42159d929b66646fa8529e17e5adad20cfd83d /recipes-containers/cri-o/files/0001-Makefile-force-symlinks.patch
parent13fe43d1e1340359be6645166b076d011dcb9abb (diff)
downloadmeta-virtualization-5569d658810b26afcf9d8ba0ab8ad5e0cc842347.tar.gz
cri-o: update to release 1.28.0
Bumping cri-o to version v1.28.0, which comprises the following commits: 23dec8c7d version: bump to v1.28.0 c104a0608 build(deps): bump github.com/containers/storage from 1.48.0 to 1.49.0 5524b65d3 add info about pulling image before doing the tutorial 922573ffe build(deps): bump crate-ci/typos from 1.16.6 to 1.16.8 67724cb6f build(deps): bump github.com/containers/podman/v4 from 4.6.0 to 4.6.1 a2d46ae01 build(deps): bump github.com/containers/ocicrypt from 1.1.7 to 1.1.8 7e3522a9c Added a flag internal-repair 39ea33e29 feat: Added a feature to check at reboot time shutdown was clean or not, If it was not clean then apply repair logic c5def7f72 build(deps): bump crate-ci/typos from 1.16.5 to 1.16.6 b873985b8 Add `conmon` to ppc64le static bundle 3e3f70c22 Update install.md 9c3d622a6 Vendor Kubernetes v1.28.0 a7f160b49 build(deps): bump crate-ci/typos from 1.16.3 to 1.16.5 d2fa125a4 Update nixpkgs and use overlay 80fdf486e Add containers_events_dropped_total metric e19002329 Fix indentation in installation instructions 94f5e75c8 Update cri-tools to v1.28.0 a8d7c29e1 Vendor Kubernetes v1.28.0-rc.1 23f51c3e1 Update OWNERS_ALIASES f1bb83127 Update runc to v1.1.9 581a388ac build(deps): bump crate-ci/typos from 1.16.2 to 1.16.3 5022d956a test/image.bats: add test for checking crun-wasm workflow 05ef7a189 *: add platform_runtime_paths to RuntimeHandler 6a0c4b9ec build(deps): bump github.com/containers/image/v5 from 5.26.1 to 5.27.0 f18d122e8 Revert "devices: fill the FileMode field in spec" 8937245b0 build-static: misc fixes needed for 1.25.4 generation abfc2d616 build(deps): bump crate-ci/typos from 1.16.1 to 1.16.2 3f06640cf contrib/test/ci: add crun-wasm 3a9232c62 build(deps): bump google.golang.org/grpc from 1.56.2 to 1.57.0 bb98e2b2a Set mount type HostToContainer for mounts that include container storage root 309d045ec add script bumping 927843ea4 test/metrics: simplify oom test, add debug 64fdfbcaa build(deps): bump github.com/opencontainers/image-spec 15a586215 build(deps): bump github.com/opencontainers/runtime-spec f30ef84ad build(deps): bump github.com/onsi/gomega from 1.27.8 to 1.27.10 ecd7f9a3e cri: implement RuntimeConfig rpc 2463fdf78 vendor: update Kubernetes to v1.28.0-beta.0 edc5ece7b build(deps): bump github.com/containers/podman/v4 ef1653c8e internal/config/seccomp: Sync call signature of (*Config).Setup 67b43c4b5 internal/config/cgmgr: add non-linux stubs 1dffd7e71 internal/config/node: add non-linux stubs ecb372986 internal/config/device: add non-linux stubs 10168b534 internal/config/nsmgr: add non-linux stubs 8edfbfd45 internal/config/capabilities: add non-linux stubs 2bd7fcbd8 internal/config/apparmor: add non-linux stubs da69490d0 oci: update unit tests for new stop code be5bac87b oci: simplify stopping code 7371b1e77 oci: don't return ErrContainerStopped from StopContainer c0e34644c build(deps): bump github.com/containers/buildah from 1.31.0 to 1.31.1 41b13e28d Fix ImageRef field for containers to default to an image ID 930f49889 runc: 1.1.7 -> 1.1.8 b563cd728 Add Adobe to ADOPTERS.md 3bc609eb1 build(deps): bump sigs.k8s.io/release-sdk from 0.10.2 to 0.10.3 4e0f88970 build(deps): bump github.com/opencontainers/runc from 1.1.7 to 1.1.8 e6af91f6a oci: change IsAlive to Living 320671ed2 devices: fill the FileMode field in spec 126bd4ca9 build(deps): bump crate-ci/typos from 1.16.0 to 1.16.1 b79391fe1 Update bats to v1.10.0 5e86a5261 build(deps): bump github.com/go-chi/chi/v5 from 5.0.8 to 5.0.10 92e1d1910 Bump vendored Podman to v4.6-rc2 a3d229acf internal/factory/container: get CDI devices from CRI field. 21181672b Add Debian 12 as a supported OS to the install doc b7c826d38 build(deps): bump github.com/containers/common from 0.55.1 to 0.55.2 151572a56 build(deps): bump github.com/container-orchestrated-devices/container-device-interface c0c7ce5ae Add OpenSSF best practices badge in favor of CII 0d92db47e build(deps): bump golang.org/x/net from 0.11.0 to 0.12.0 70e5b76ca build(deps): bump google.golang.org/grpc from 1.56.1 to 1.56.2 79859a9d9 build(deps): bump crate-ci/typos from 1.15.10 to 1.16.0 7ebe2f614 Update vendored Kubernetes to v1.28.0-alpha.4 c28303fad container_test: fix "AddCapabilities ALL" test case e176397c8 vendor: drop podman replace and update runc eff07b834 Run irqbalance tests in serial within the actual suite 059dce220 build(deps): bump crate-ci/typos from 1.15.9 to 1.15.10 d43833d61 Bump bats in ci jobs to latest release 66ac754c7 build(deps): bump github.com/containers/buildah from 1.30.0 to 1.31.0 59952bf00 build(deps): bump github.com/containers/common from 0.54.0 to 0.55.1 ff3bb58db build(deps): bump crate-ci/typos from 1.15.7 to 1.15.9 4fe0b8164 build(deps): bump github.com/containers/image/v5 from 5.26.0 to 5.26.1 cb51739b1 server: use platform struct to set OS details bac73aa42 Pre-check request values on container creation 5a85cfc95 Remove non existent Debian builds from install instructions 73cf5597a test: fix make mockgen test failure dfdd2acde vendor: update release-sdk to v0.10.2 abcf50239 build(deps): bump google.golang.org/grpc from 1.55.0 to 1.56.1 9c78a1e23 vendor: update containers/storage to v1.48.0 87b126342 build(deps): bump github.com/intel/goresctrl from 0.3.0 to 0.4.0 8a9d4ef17 vendor: update containers/common to v0.54.0 cb247caf5 build(deps): bump github.com/containers/image/v5 from 5.25.0 to 5.26.0 ad3dd698b build(deps): bump google.golang.org/protobuf from 1.30.0 to 1.31.0 b8bb276a0 build(deps): bump github.com/uptrace/opentelemetry-go-extra/otellogrus 0882a1dcb build(deps): bump crate-ci/typos from 1.15.6 to 1.15.7 6b9e49d3b Try to find `CONTAINER_CNI_PLUGIN_DIR` by binary lookup 40bbe8218 vendor: fix vendoring issue f6317807c typos: add WRONLY to the list of extend-ignore-re 6a10113c7 build(deps): bump crate-ci/typos from 1.14.12 to 1.15.6 1062a4cd3 build(deps): bump ossf/scorecard-action from 2.1.3 to 2.2.0 91d6bd38b vendor: bump github.com/onsi/ginkgo/v2 to 2.11.0 7f66c1428 build(deps): bump cachix/install-nix-action from 21 to 22 d0526337e vendor: bump github.com/urfave/cli/v2 to 2.25.7 7a2b9a220 vendor: bump golang.org/x/sync to 0.3.0 ba0751938 vendor: bump golang.org/x/net to 0.11.0 9f0680cde vendor: bump github.com/prometheus/client_golang to 1.16.0 67a132dc6 runtime handler hooks: run default hook when container stops gracefully 49d9efe8b vendor: bump github.com/stretchr/testify to 1.8.4 001733570 vendor: bump github.com/sigstore/rekor to 1.2.1 d274dd121 Use a variable to manage the version of kata used for testing. 4a7d0857b Update supported version and variable guide for adding repository 0534d7eff governance: tweak voting behavior bfc7cf55a Use kata 3.0 for testing db4b8eaab kata tests: Enabling more than one test file for kata tests. 0f08aeb6f kata tests: Update list of skipped tests for the ctr.bats file 4310e3342 Modify ansible files to re-enable kata tests 8224bd8a5 build(deps): bump go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc f84eb7874 Move reload watcher into `Server` e3b7406b9 Update golangci-lint and config 159aaf6c6 utils: make this package build on non-linux platforms c088d69aa fix function name in comment c702bb78a build(deps): bump DavidAnson/markdownlint-cli2-action from 10 to 11 098fbebf7 Add a test for log linking 5620764ae linklogs: add support for symlinking container directory 5d7ecfe4b Add support for linking pods logs a7d314bea build(deps): bump ossf/scorecard-action from 2.1.2 to 2.1.3 e614bc756 server: ensure pod labels are present d84cc85c5 build(deps): bump github.com/BurntSushi/toml from 1.3.1 to 1.3.2 72b735603 OCPBUGS-14750: Pod termination must succeed when a hook fails 98c43d537 Add OSFF scorecard action 85c7e712e main: Added a call to GarbageCollect ccb91bc8a docs: fix eol test 08f7c0776 build(deps): bump github.com/onsi/gomega from 1.27.7 to 1.27.8 f2feb7c6f Use staging k8s.io/kubelet/cri/streaming package 72011b3c4 Add support for namespaced signature policies 3939fba97 Apply markdown linting, cleanup docs and fix broken links #6890 96e6aed74 Apply markdown linting on the tutorials folder #6890 2ead2413a Apply markdown linting on the contrib folder #6890 5d7b64018 Add markdown linter action #6890 d58f408f5 test: fix timeout metric test 5f74e7994 build(deps): bump github.com/BurntSushi/toml from 1.3.0 to 1.3.1 c87b11115 server: do not take lock to populate pid in container status and inspect 28b34889a build(deps): bump github.com/sirupsen/logrus from 1.9.2 to 1.9.3 b373909cf build(deps): bump github.com/containerd/containerd from 1.7.1 to 1.7.2 d456a11ef crio: deprecate config migration 259e7980c metrics: add metric for resource stalled at stage 85a4ba091 build(deps): bump crate-ci/typos from 1.14.11 to 1.14.12 75aacdb04 Drop support for path based seccomp profiles e18e2e90a test/helpers: rm useless code b7d1c2e61 test/helpers: use cli to set container dirs 459372c24 test: adapt for sched_load_balance disable after stop 6da8e46b1 runtime handler hooks: add DefaultCPULoadBalanceHooks 23b9179f9 server: call hooks and NRI in stopContainer e1c68ea2a Update `README.md` version table 56ac8ac79 crio: remove DefaultsPath config feature b2a20a418 server: call hooks on infra container creation 2efd04aa4 high perf hooks: workaround libcontainer quirk when disabling cpu quota 9ec701691 cgmgr: export CrioPrefix and use containerCgroupPath more 775690b1e build(deps): bump github.com/onsi/ginkgo/v2 from 2.9.5 to 2.9.7 cf7e0946e tests/timeout: skip for conmon-rs c1c431836 ci/gha: add space-at-eol check, fix existing ones 0a35354c4 build(deps): bump github.com/BurntSushi/toml from 1.2.1 to 1.3.0 65792546b ci: bump shellcheck to 0.9.0 6b2f35e2c test: fix a few cases of SC2086 d6b793c46 contrib/kube-local/kube-local: rm unreachable code b6014826c test/copyimg: use log.Fatalf 587e3d595 test/*.bats: rm useless echo "$output" bdb765635 test: rm explicit $status checks 933e33c1c test: simplify assigning IDs 22978429a test/status.bats: simplify exit code checks ff7bc1b52 test: simplify non-zero exit status checks 0bf509d35 test/cdi.bats: rm run_cmd, use run 21e5dcebe test/nri.bats: fix checking exit code 2fab13028 test/README.md: fix wrong bats example 9c2fcb3bd test/*bats: drop fail() 84ee0c931 Fix using ! in bats tests 045c026da test/timeout: fix "dup ctr" test 1da9bf5f7 ci: require bats 1.9.0 c5a1c1b1e test: separate var setting and img preload 7b9e5201b ci: bump bats to 1.9.0 9ad33da53 build(deps): bump github.com/containers/podman/v4 from 4.5.0 to 4.5.1 2604665cc Update nix and nixpkgs 792a5d0ad test: limit number of parallel jobs 1cc1958de test/cgroup: fix for cgroupfs aa86e94f0 ci/gha: fix double caching 47c13e037 [FEAT] Add new parameter disable_hostport_mapping in CRI-O df7df847d build(deps): bump go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc f7f085f6f Makefile: Remove GOPATH references 1eeaad851 build(deps): bump cachix/install-nix-action from 20 to 21 7cc3e206c build(deps): bump github.com/onsi/gomega from 1.27.6 to 1.27.7 3b5c9f115 build(deps): bump crate-ci/typos from 1.14.10 to 1.14.11 7003312b0 OCPNODE-1286: Add a CI job to run cri-o e2e tests by enabling the evented pleg feature 47958dc0b Update crun to v1.8.5 9b6a4cff7 Wrap CRI errors on image pull defdf1c9e build(deps): bump github.com/sirupsen/logrus from 1.9.0 to 1.9.2 6a3ee4e6b docs: update cri-o podman doc and remove stale information 7ed2cfc7f deps: bump runc to 1.1.7 f59c1f72a sandbox: Handle PodLinuxOverhead and PodLinuxResources CRI fields f5e58c0ea build(deps): bump crate-ci/typos from 1.14.9 to 1.14.10 1009668bb build(deps): bump github.com/stretchr/testify from 1.8.2 to 1.8.3 42e0f7fac go.{mod,sum}, vendor: update NRI. d97ac8a10 contrib/test: reenable Statefulset Basic tests 3761965f8 contrib/test: re-enable block volmod tests 003edc26c high perf hooks: disable CPU quota with libcontainer as a pre start hook a875ef486 test: add test for cpu-quota.crio.io e1c3cf960 Check and fix typos in CI fa57ffd3e *: switch to go-chi/chi mux 6330b1d5f build(deps): bump github.com/cloudflare/circl from 1.1.0 to 1.3.3 786109a6e build(deps): bump github.com/containerd/containerd from 1.7.0 to 1.7.1 ecc712850 Support image policy verification error ccaef6a7d build(deps): bump github.com/onsi/ginkgo/v2 from 2.9.4 to 2.9.5 484870532 build(deps): bump sigs.k8s.io/release-utils from 0.7.3 to 0.7.4 3480e9efa Fix GitHub action `bundles` test 937ed8cf6 - Convert status cli as a subcommand of crio - Moved commands to the internal criocli package and used them in the crio and crio-status binaries - Adding the status subcommands directly to the binary a247c52d9 pkg/config: update the description for templateStringCrioImagePinnedImages 4fadec5f1 internal/storge: fix CompileRegexpsForPinnedImages test case 5e751fda3 vendor: fix vendoring 5ecc82e6f contrib/metrics-explorer: fix nested modules 640624ec9 Update CNI plugins to v1.3.0 9fc177ed4 build(deps): bump golang.org/x/net in /contrib/metrics-exporter 8b230dec7 clients connected to container event stream now receive the same data 3fd71bdc9 vendor: fix CI due to incosistent vendoring 20fd7770e fix kubectl version in bug report template 21b47b11c *: update sandbox/pause image to 3.9 edbd4890f internal/storage: add sandbox/pause image to the list of pinned_images b0531365f build(deps): bump github.com/containernetworking/plugins 22ad8957b Changes to build binaries for ppc64le architecture. 32ec246ba Update README.md and associated files f10ea341d build(deps): bump golang.org/x/net from 0.9.0 to 0.10.0 c9bb988d1 *: fix warnings related to gosec 0e65290c4 .github/worflows: add go vulnerability management check for cri-o f9abf50c9 pkg/config: reload pinned_images when the new config is provided bbe9a7a2c *: add support for pinned_images in crio configuration dfcf222c3 refactoring vars 386509caf Use native crierrors package for registry unavailable a90d00103 build(deps): bump golang.org/x/sys from 0.7.0 to 0.8.0 16ab25339 Vendor latest Kubernetes master 6a095aef7 build(deps): bump google.golang.org/grpc from 1.54.0 to 1.55.0 5c064914f build(deps): bump golang.org/x/sync from 0.1.0 to 0.2.0 639b6dddf OWNERS: add sohankunkerkar to cri-o-reviewers 4477a804b tests: add a fake pinns call to delay things and cause the timeout 6fa761497 tests: use crictl binary directly when checking its capabilities 1ff3303df cni: configure cgroupPath capability arg e52e63a41 vendor: bump ocicni to tip 914763fb1 Remove vendor specific changes 08cd56fc9 Migrate image registry to registry.k8s.io 3311658af build(deps): bump github.com/uptrace/opentelemetry-go-extra/otellogrus 02fe074f2 build(deps): bump github.com/onsi/ginkgo/v2 from 2.9.2 to 2.9.4 0b8a2c068 build(deps): bump github.com/sigstore/rekor from 1.1.0 to 1.1.1 660b63bd7 cgmgr: set sched_load_balance to disabled on sandbox cgroup 5a1707e4c test/pod.bats: update to current setup f83a4faba cgmgr: create cgroups for systemd cgroup driver for dropped infra pods f21e178f8 build(deps): bump github.com/prometheus/client_golang bf23f5c01 Support `RegistryUnavailable` type e80464e07 Update generated docs ed9c419e7 OWNERS: allow cri-o reviewers to approve dependabot PRs 58c101634 build(deps): bump github.com/urfave/cli/v2 from 2.25.1 to 2.25.3 a4fc119af .github/workflows: remove auto-approve workflow a0009cb25 build(deps): bump go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc 541b6563d Extend cpu-c-states.crio.io annotation to add max latency 2417374a6 build(deps): bump k8s.io/klog/v2 from 2.90.1 to 2.100.1 249c340d3 contrib/test/ci: fix the bin folder location for cri-tools cf30845e7 #6833 user ns: Fix segfault while constructing id mappings 38774e14a Use ImageRef instead of ImageName for restore 1f224d1e0 build(deps): bump go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc 7c6676f02 contrib/test/ci/build: use `force:yes` while linking crictl/critest c9cc1529f .github/workflows: fix the github_token field a1c09ad99 .github/workflows: fix the token field 30ddd6d89 Fix events generated by Evented PLEG b8d8ff14b Update c/common to v0.53.0 b34038f8f build(deps): bump actions/setup-go from 3 to 4 4c828dc48 build(deps): bump github.com/opencontainers/runtime-spec 928d5d49c build(deps): bump github.com/prometheus/client_golang e806005d6 test/network: skip flaky test running on a node with cgroupv2 e914f0e15 test: combined oom test to avoid CI flake d5048e7ff test/seccomp: fix the syscall 473ee6b73 contrib/test/ci: remove duplicate code a1c6ae7e4 test/*: consolidate images used for integration tests 25fb4fa76 build(deps): bump github.com/Microsoft/go-winio from 0.6.0 to 0.6.1 a950c837d Download more dependencies instead of vendoring 839bd1203 build(deps): bump github.com/containers/conmon-rs from 0.5.0 to 0.5.1 edbe9c27e build(deps): bump github.com/go-logr/logr from 1.2.3 to 1.2.4 e53dcc003 Stop vendoring release notes tool 1c26776cb .github/workflows: auto approve dependabot PRs e967a178c user ns: fix segfault when host id mapping is empty 19c0b4d7b server: fix failing tests edf6a88a9 build(deps): bump k8s.io/release from 0.15.0 to 0.15.1 7a612bc4b Allow restoring of containers with different names 86b36ee6e build(deps): bump lumaxis/shellcheck-problem-matchers from 1 to 2 6da5b1272 build(deps): bump actions/stale from 7 to 8 1c1cfb92a Fix Flannel PodCIDR in kubeadm tutorial bac3a79b6 adding support for configmap namespace 603f176a0 Add debug to identify when a relabel was not requested f9fa10915 Update tutorials/debugging.md 75c8b181b Added documentation to force the Go garbage collector for CRI-O 11f5c4326 Remove remnants of CONTAINER_MANAGE_NS_LIFECYCLE Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-containers/cri-o/files/0001-Makefile-force-symlinks.patch')
-rw-r--r--recipes-containers/cri-o/files/0001-Makefile-force-symlinks.patch28
1 files changed, 0 insertions, 28 deletions
diff --git a/recipes-containers/cri-o/files/0001-Makefile-force-symlinks.patch b/recipes-containers/cri-o/files/0001-Makefile-force-symlinks.patch
deleted file mode 100644
index 50a36eec..00000000
--- a/recipes-containers/cri-o/files/0001-Makefile-force-symlinks.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From 52fd70ae7d82dfa0db46ff7ba67cfb4868074368 Mon Sep 17 00:00:00 2001
2From: Bruce Ashfield <bruce.ashfield@gmail.com>
3Date: Tue, 7 Jun 2022 15:42:22 -0400
4Subject: [PATCH] Makefile: force symlinks
5
6Upstream-Status: Inappropriate [embedded specific]
7
8Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
9---
10 Makefile | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13diff --git a/src/import/Makefile b/src/import/Makefile
14index 8abc8619d..d1a98f3d3 100644
15--- a/src/import/Makefile
16+++ b/src/import/Makefile
17@@ -141,7 +141,7 @@ help:
18 .gopathok:
19 ifeq ("$(wildcard $(GOPKGDIR))","")
20 mkdir -p "$(GOPKGBASEDIR)"
21- ln -s "$(CURDIR)" "$(GOPKGDIR)"
22+ ln -sf "$(CURDIR)" "$(GOPKGDIR)"
23 endif
24 if [ ! -d "$(GOPATH)" ]; then mkdir -p $(GOPATH); fi
25 touch "$(GOPATH)/.gopathok"
26--
272.19.1
28