!367 【轻量级 PR】：edge_ISO change kubeedge to k3s

From: @yang-chaohao 
Reviewed-by: @zhuchunyi 
Signed-off-by: @zhuchunyi

edge_normal_aarch64.xml

@@ -117,10 +117,10 @@
       <packagereq type="default">kubernetes-kubelet</packagereq>
       <packagereq type="default">kubernetes-master</packagereq>
       <packagereq type="default">kubernetes-node</packagereq>
-      <packagereq type="default">kubeedge-cloudcore</packagereq>
+      <packagereq type="default">k3s</packagereq>
-      <packagereq type="default">kubeedge-edgecore</packagereq>
+      <packagereq type="default">k3s-selinux</packagereq>
-      <packagereq type="default">kubeedge-edgesite</packagereq>
+      <packagereq type="default">k3s-plugins</packagereq>
-      <packagereq type="default">kubeedge-keadm</packagereq>
+      <packagereq type="default">k3s-containerd</packagereq>
       <packagereq type="default">mdadm</packagereq>
       <packagereq type="default">mdadm-help</packagereq>
     </packagelist>

edge_normal_x86_64.xml

@@ -117,10 +117,10 @@
       <packagereq type="default">kubernetes-kubelet</packagereq>
       <packagereq type="default">kubernetes-master</packagereq>
       <packagereq type="default">kubernetes-node</packagereq>
-      <packagereq type="default">kubeedge-cloudcore</packagereq>
+      <packagereq type="default">k3s</packagereq>
-      <packagereq type="default">kubeedge-edgecore</packagereq>
+      <packagereq type="default">k3s-selinux</packagereq>
-      <packagereq type="default">kubeedge-edgesite</packagereq>
+      <packagereq type="default">k3s-plugins</packagereq>
-      <packagereq type="default">kubeedge-keadm</packagereq>
+      <packagereq type="default">k3s-containerd</packagereq>
       <packagereq type="default">mdadm</packagereq>
       <packagereq type="default">mdadm-help</packagereq>
     </packagelist>

oemaker.spec

@@ -11,7 +11,7 @@ Summary:        a building tool for DVD ISO making and ISO cutting
 License:        Mulan PSL v2
 Group:          System/Management
 Version:        3.2.0
-Release:        7
+Release:        8
 BuildRoot:      %{_tmppath}/%{name}
 
 Source:         https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
@@ -186,6 +186,11 @@ rm -rf %{buildroot}
 rm -rf $RPM_BUILD_DIR/%{name}
 
 %changelog
+* Fri Dec 6 2024 yangchaohao <yangchaohao@huawei.com> - 3.2.0-8
+- ID:NA
+- SUG:NA
+- DESC: edge_ISO change kubeedge to k3s
+
 * Thu Dec 5 2024 zhaolichang <zhaolichang@huawei.com> - 3.2.0-7
 - ID:NA
 - SUG:NA

rpmlist.xml

@@ -1400,10 +1400,10 @@
         <packagereq>kubernetes-kubelet</packagereq>
         <packagereq>kubernetes-master</packagereq>
         <packagereq>kubernetes-node</packagereq>
-        <packagereq>kubeedge-cloudcore</packagereq>
+        <packagereq>k3s</packagereq>
-        <packagereq>kubeedge-edgecore</packagereq>
+        <packagereq>k3s-selinux</packagereq>
-        <packagereq>kubeedge-edgesite</packagereq>
+        <packagereq>k3s-plugins</packagereq>
-        <packagereq>kubeedge-keadm</packagereq>
+        <packagereq>k3s-containerd</packagereq>
         <packagereq>grub2-common</packagereq>
         <packagereq>grub2-tools-minimal</packagereq>
         <packagereq>grub2-tools-extra</packagereq>