From 7c5f6296e634424c7cb19942ced3f4970b381adc Mon Sep 17 00:00:00 2001 From: weiyuan Date: Tue, 21 May 2024 09:26:13 +0800 Subject: [PATCH] support crio container engine --- .../0012-support-crio-container-engine.patch | 41 +++++++++++++++++++ rubik.spec | 8 +++- series.conf | 1 + 3 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 patch/0012-support-crio-container-engine.patch diff --git a/patch/0012-support-crio-container-engine.patch b/patch/0012-support-crio-container-engine.patch new file mode 100644 index 0000000..88b67b1 --- /dev/null +++ b/patch/0012-support-crio-container-engine.patch @@ -0,0 +1,41 @@ +From 8f7117653503d1f72df7ae35b45d48decce62154 Mon Sep 17 00:00:00 2001 +From: weiyuan +Date: Mon, 20 May 2024 15:23:01 +0800 +Subject: [PATCH] support crio container engine + +--- + pkg/core/typedef/containerinfo.go | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/pkg/core/typedef/containerinfo.go b/pkg/core/typedef/containerinfo.go +index f751b25..845105f 100644 +--- a/pkg/core/typedef/containerinfo.go ++++ b/pkg/core/typedef/containerinfo.go +@@ -36,6 +36,8 @@ const ( + CONTAINERD + // ISULAD means isulad container engine + ISULAD ++ // CRIO means crio container engine ++ CRIO + ) + + var ( +@@ -43,6 +45,7 @@ var ( + DOCKER: "docker://", + CONTAINERD: "containerd://", + ISULAD: "iSulad://", ++ CRIO: "cri-o://", + } + currentContainerEngines = UNDEFINED + setContainerEnginesOnce sync.Once +@@ -50,6 +53,7 @@ var ( + DOCKER: "docker", + CONTAINERD: "cri-containerd", + ISULAD: "isulad", ++ CRIO: "crio", + } + ) + +-- +2.39.2 (Apple Git-143) + diff --git a/rubik.spec b/rubik.spec index e3cd9b1..371288e 100644 --- a/rubik.spec +++ b/rubik.spec @@ -1,6 +1,6 @@ Name: rubik Version: 2.0.0 -Release: 4 +Release: 5 Summary: Hybrid Deployment for Cloud Native License: Mulan PSL V2 URL: https://gitee.com/openeuler/rubik @@ -56,6 +56,12 @@ install -Dp ./build_rubik_image.sh %{buildroot}%{_sharedstatedir}/%{name}/build_ rm -rf %{buildroot} %changelog +* Tue May 21 2024 weiyuan - 2.0.0-5 +- Type: bugfix +- CVE:NA +- SUG:restart +- DESC:support crio container engine + * Fri May 10 2024 weiyucheng - 2.0.0-4 - Type:bugfix - CVE:NA diff --git a/series.conf b/series.conf index 024edae..72d59b2 100644 --- a/series.conf +++ b/series.conf @@ -9,4 +9,5 @@ patch/0008-rubik-test-coverage-improvement-for-pkg-config.patch patch/0009-rubik-optimize-dynamicAdjust-to-be-clear-and-add-log.patch patch/0010-support-isulad-container-engine.patch patch/0011-support-systemd-cgroup-driver.patch +patch/0012-support-crio-container-engine.patch #end of file