Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not conflict kubernetes-cni package for RPMs #1367

Closed
wants to merge 1 commit into from
Closed

Do not conflict kubernetes-cni package for RPMs #1367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion cmd/kubepkg/templates/latest/rpm/kubelet/kubelet.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ Requires: ethtool
Requires: iproute
Requires: ebtables
Requires: conntrack
Obsoletes: kubernetes-cni
Conflicts: kubernetes-cni
saschagrunert marked this conversation as resolved.
Show resolved Hide resolved

%description
Expand Down Expand Up @@ -67,6 +66,10 @@ mv cni-plugins/* %{buildroot}/opt/cni/bin/


%changelog
* Thu Jun 18 2020 Sascha Grunert <sgrunert@suse.com.com> - 1.18.4
- Do not Obsolete with kubernetes-cni package to unbreak previous
releases

* Fri May 22 2020 Stephen Augustus <saugustus@vmware.com> - 1.18.4
- Bundle CNI plugins (v0.8.6) in kubelet package

Expand Down
5 changes: 4 additions & 1 deletion packages/rpm/kubelet.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ Requires: ethtool
Requires: iproute
Requires: ebtables
Requires: conntrack
Obsoletes: kubernetes-cni
Conflicts: kubernetes-cni


Expand Down Expand Up @@ -145,6 +144,10 @@ mv cni-plugins/* %{buildroot}/opt/cni/bin/


%changelog
* Thu Jun 18 2020 Sascha Grunert <sgrunert@suse.com.com> - 1.18.4
- Do not Obsolete with kubernetes-cni package to unbreak previous
releases

* Fri May 29 2020 Stephen Augustus <saugustus@vmware.com> - 1.18.4
- Source cri-tools from https://storage.googleapis.com/k8s-artifacts-cri-tools/release
instead of https://github.com/kubernetes-sigs/cri-tools
Expand Down