!49 support crio container engine
From: @easter1007 Reviewed-by: @xuxuepeng, @duguhaotian Signed-off-by: @duguhaotian, @xuxuepeng
This commit is contained in:
commit
ac1646b9b8
41
patch/0012-support-crio-container-engine.patch
Normal file
41
patch/0012-support-crio-container-engine.patch
Normal file
@ -0,0 +1,41 @@
|
||||
From 8f7117653503d1f72df7ae35b45d48decce62154 Mon Sep 17 00:00:00 2001
|
||||
From: weiyuan <weiyuan@kylinos.cn>
|
||||
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)
|
||||
|
||||
@ -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 <weiyuan@kylinos.cn> - 2.0.0-5
|
||||
- Type: bugfix
|
||||
- CVE:NA
|
||||
- SUG:restart
|
||||
- DESC:support crio container engine
|
||||
|
||||
* Fri May 10 2024 weiyucheng <weiyucheng@kylinos.cn> - 2.0.0-4
|
||||
- Type:bugfix
|
||||
- CVE:NA
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user