diff --git a/Fix-pod-management-cannot-be-canceled.patch b/Fix-pod-management-cannot-be-canceled.patch deleted file mode 100644 index 5adf937dc4d1b5ed15c47d294c5dfa7b552c2c39..0000000000000000000000000000000000000000 --- a/Fix-pod-management-cannot-be-canceled.patch +++ /dev/null @@ -1,26 +0,0 @@ -From f75438dd75c2991f396d4d5c7f8fc4d11410bd5d Mon Sep 17 00:00:00 2001 -From: weli-l <1289113577@qq.com> -Date: Thu, 11 Jul 2024 16:35:22 +0800 -Subject: [PATCH] fix pod management cannot be canceld - ---- - pkg/controller/manage/kmesh_manage.go | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/pkg/controller/manage/kmesh_manage.go b/pkg/controller/manage/kmesh_manage.go -index f79dee4..f273083 100644 ---- a/pkg/controller/manage/kmesh_manage.go -+++ b/pkg/controller/manage/kmesh_manage.go -@@ -210,9 +210,6 @@ func shouldEnroll(client kubernetes.Interface, pod *corev1.Pod) bool { - if strings.EqualFold(pod.Labels[constants.DataPlaneModeLabel], constants.DataPlaneModeKmesh) { - return true - } -- if pod.Annotations[constants.KmeshRedirectionAnnotation] == "enabled" { -- return true -- } - - ns, err := client.CoreV1().Namespaces().Get(context.TODO(), pod.Namespace, metav1.GetOptions{}) - if err != nil { --- -2.34.1 - diff --git a/Kmesh.spec b/Kmesh.spec index 18a406e3b0a7fddb295c42853a3b982f9669ff29..a8b4141a91fe30f27733b6a0253da78b24a00844 100644 --- a/Kmesh.spec +++ b/Kmesh.spec @@ -1,11 +1,11 @@ %global codepath kmesh Name: Kmesh -Version: 0.4.0 +Version: 0.4.1 Release: 2 Summary: %{name} is a eBPF-based service mesh kernel solution License: ASL 2.0 and GPL-2.0 URL: https://github.com/kmesh-net -Source0: https://github.com/kmesh-net/kmesh/releases/tag/v%{version}.tar.gz +Source0: https://github.com/kmesh-net/kmesh/archive/refs/tags/v%{version}.tar.gz BuildRequires: cmake make pkgconf dracut BuildRequires: protobuf protobuf-c protobuf-c-devel @@ -21,8 +21,7 @@ Requires: libboundscheck Patch0001: Downgrade-go-version-to-v1.21.4.patch Patch0002: Remove-useless-tag-in-Makefile.patch -Patch0003: Fix-pod-management-cannot-be-canceled.patch -Patch0004: Support-uid-gid.patch +Patch0003: Support-uid-gid.patch %description %{name} is a eBPF-based service mesh kernel solution. @@ -43,14 +42,14 @@ go mod tidy %install mkdir -p %{buildroot}%{_bindir} install %{_builddir}/%{codepath}-%{version}/kmesh-daemon %{buildroot}%{_bindir} -install -Dpm 0600 %{_builddir}/%{codepath}-%{version}/kmesh-cni %{buildroot}%{_bindir} +install -Dpm 0400 %{_builddir}/%{codepath}-%{version}/kmesh-cni %{buildroot}%{_bindir} install %{_builddir}/%{codepath}-%{version}/build/kmesh-start-pre.sh %{buildroot}%{_bindir} install %{_builddir}/%{codepath}-%{version}/build/kmesh-stop-post.sh %{buildroot}%{_bindir} install %{_builddir}/%{codepath}-%{version}/oncn-mda/deploy/mdacore %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_datarootdir}/oncn-mda -install -Dpm 0600 %{_builddir}/%{codepath}-%{version}/oncn-mda/build/ebpf_src/CMakeFiles/sock_ops.dir/sock_ops.c.o %{buildroot}%{_datarootdir}/oncn-mda -install -Dpm 0600 %{_builddir}/%{codepath}-%{version}/oncn-mda/build/ebpf_src/CMakeFiles/sock_redirect.dir/sock_redirect.c.o %{buildroot}%{_datarootdir}/oncn-mda +install -Dpm 0400 %{_builddir}/%{codepath}-%{version}/oncn-mda/build/ebpf_src/CMakeFiles/sock_ops.dir/sock_ops.c.o %{buildroot}%{_datarootdir}/oncn-mda +install -Dpm 0400 %{_builddir}/%{codepath}-%{version}/oncn-mda/build/ebpf_src/CMakeFiles/sock_redirect.dir/sock_redirect.c.o %{buildroot}%{_datarootdir}/oncn-mda mkdir -p %{buildroot}/kmesh install %{_builddir}/%{codepath}-%{version}/build/docker/start_kmesh.sh %{buildroot}/kmesh @@ -110,9 +109,9 @@ rm -rf %{buildroot} %attr(0500,root,root) /usr/lib64/libkmesh_deserial.so %attr(0500,root,root) /usr/lib64/libkmesh_api_v2_c.so -%attr(0500,root,root) %dir /usr/share/oncn-mda -%attr(0500,root,root) /usr/share/oncn-mda/sock_ops.c.o -%attr(0500,root,root) /usr/share/oncn-mda/sock_redirect.c.o +%attr(0400,root,root) %dir /usr/share/oncn-mda +%attr(0400,root,root) /usr/share/oncn-mda/sock_ops.c.o +%attr(0400,root,root) /usr/share/oncn-mda/sock_redirect.c.o %attr(0700,root,root) %dir %{_sysconfdir}/oncn-mda %config(noreplace) %attr(0600,root,root) %{_sysconfdir}/oncn-mda/oncn-mda.conf @@ -122,6 +121,9 @@ rm -rf %{buildroot} %attr(0500,root,root) /kmesh/start_kmesh.sh %changelog +* Thu Mar 6 2025 weli-l<1289113577@qq.com> - 0.4.1-2 +- upgrade Kmesh + * Wed Feb 19 2025 weli-l<1289113577@qq.com> - 0.4.0-2 - modify ebpf prog premissions diff --git a/v0.4.0.tar.gz b/v0.4.1.tar.gz similarity index 77% rename from v0.4.0.tar.gz rename to v0.4.1.tar.gz index ed91aaaa51bd01392435b39f95abc5ca2c65d211..d12576adc7f9b6d4dd029444eeff8179a06fbff8 100644 Binary files a/v0.4.0.tar.gz and b/v0.4.1.tar.gz differ