已开启
[sync] PR-23: 去除对kubernetes-client的conflict声明 #29
AtomGit-Bot创建于 2025年8月12日
[sync] PR-23: 去除对kubernetes-client的conflict声明 #29
已开启
共 1 个文件变更+4-2
| @@ -3,7 +3,7 @@ | |||
| 3 | 3 | ||
| 4 | Name: k3s | 4 | Name: k3s |
| 5 | Version: 1.24.2+rc1+k3s2 | 5 | Version: 1.24.2+rc1+k3s2 |
| 6 | -Release: 4 | 6 | +Release: 5 |
| 7 | Summary: Installer for k3s optimised for openSUSE MicroOS | 7 | Summary: Installer for k3s optimised for openSUSE MicroOS |
| 8 | License: Apache-2.0 | 8 | License: Apache-2.0 |
| 9 | Group: System/Management | 9 | Group: System/Management |
| @@ -24,7 +24,6 @@ Requires: k3s-selinux | |||
| 24 | Requires: iptables | 24 | Requires: iptables |
| 25 | Conflicts: cri-tools | 25 | Conflicts: cri-tools |
| 26 | Conflicts: kubectl | 26 | Conflicts: kubectl |
| 27 | -Conflicts: kubernetes-client | ||
| 28 | Conflicts: kubernetes-client-provider | 27 | Conflicts: kubernetes-client-provider |
| 29 | 28 | ||
| 30 | Requires(post): systemd | 29 | Requires(post): systemd |
| @@ -93,6 +92,9 @@ cp install.sh %{buildroot}%{_sbindir}/k3s-install.sh | |||
| 93 | %{_sbindir}/k3s-install.sh | 92 | %{_sbindir}/k3s-install.sh |
| 94 | 93 | ||
| 95 | %changelog | 94 | %changelog |
| 95 | +* Tue Jun 24 2025 Renjian Zhou <zhourenjian@huawei.com> - 1.24.2+rc1+k3s2-5 | ||
| 96 | +- delete conflict of kubernetes-client | ||
| 97 | + | ||
| 96 | * Sun Apr 21 2024 Yuncheng Zhu <zhuyuncheng@huawei.com> - 1.24.2+rc1+k3s2-4 | 98 | * Sun Apr 21 2024 Yuncheng Zhu <zhuyuncheng@huawei.com> - 1.24.2+rc1+k3s2-4 |
| 97 | - change requirement docker-runc to runc | 99 | - change requirement docker-runc to runc |
| 98 | 100 | ||