Hello community, here is the log from the commit of package kubernetes1.18 for openSUSE:Factory checked in at 2020-09-03 01:14:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kubernetes1.18 (Old) and /work/SRC/openSUSE:Factory/.kubernetes1.18.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kubernetes1.18" Thu Sep 3 01:14:10 2020 rev:9 rq:830737 version:1.18.8 Changes: -------- --- /work/SRC/openSUSE:Factory/kubernetes1.18/kubernetes1.18.changes 2020-08-20 22:27:51.991954318 +0200 +++ /work/SRC/openSUSE:Factory/.kubernetes1.18.new.3399/kubernetes1.18.changes 2020-09-03 01:15:01.696489840 +0200 @@ -1,0 +2,20 @@ +Fri Aug 28 13:01:23 UTC 2020 - Richard Brown <[email protected]> + +- Introduce kubernetes$FOO-client-common package to make -client truely parralel installable + +------------------------------------------------------------------- +Thu Aug 20 14:40:53 UTC 2020 - Richard Brown <[email protected]> + +- Harmonise macro names, use baseversionminus1 across all k8s packages for previous version number + +------------------------------------------------------------------- +Thu Aug 20 11:44:52 UTC 2020 - Jean-Philippe Evrard <[email protected]> + +- Remove old macro on maxcriversion, with the new relaxed constraints + +------------------------------------------------------------------- +Thu Aug 20 10:32:33 UTC 2020 - Jean-Philippe Evrard <[email protected]> + +- Relax constraints on kubeadm + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kubernetes1.18.spec ++++++ --- /var/tmp/diff_new_pack.Muycru/_old 2020-09-03 01:15:03.356490450 +0200 +++ /var/tmp/diff_new_pack.Muycru/_new 2020-09-03 01:15:03.360490452 +0200 @@ -17,10 +17,9 @@ %{!?tmpfiles_create:%global tmpfiles_create systemd-tmpfiles --create} -# maxcriversion - version of cri-tools which is notsupported by this version of kubeadm. -%define maxcriversion 1.19 # baseversion - version of kubernetes for this package %define baseversion 1.18 +%define baseversionminus1 1.17 Name: kubernetes%{baseversion} Version: 1.18.8 @@ -143,15 +142,12 @@ Provides: kubernetes-kubeadm-provider = %{version} Conflicts: kubernetes-kubeadm-provider Requires: cri-runtime -# Kubeadm 1.15.0 requires cri-tools 1.14.0 or higher (see changelog) -Requires: cri-tools >= 1.14.0 Requires: ebtables Requires: ethtool Requires: kubernetes-kubeadm-criconfig Requires: socat Requires(pre): shadow -Requires: kubernetes%{baseversion}-kubelet -Conflicts: cri-tools >= %{maxcriversion} +Requires: (kubernetes%{baseversion}-kubelet or kubernetes%{baseversionminus1}-kubelet) %description kubeadm Manage a cluster of Linux containers as a single system to accelerate Dev and simplify Ops. @@ -161,13 +157,24 @@ Summary: Kubernetes client tools Group: System/Management Provides: kubernetes-client-provider = %{version} +Requires: kubernetes-client-common >= %{version} Requires(post): update-alternatives Requires(postun): update-alternatives -Recommends: bash-completion %description client Kubernetes client tools like kubectl. +%package client-common +Summary: Kubernetes client tools common files +Group: System/Management +Requires: kubernetes%{baseversion}-client +Provides: kubernetes-client-common = %{version} +Conflicts: kubernetes-client-common +Recommends: bash-completion + +%description client-common +Kubernetes client tools common files + %prep %setup -q -n kubernetes-%{version} %patch2 -p0 @@ -293,12 +300,12 @@ %fdupes -s %{buildroot} -%post client +%post client-common export baseversion="%{baseversion}" %{_sbindir}/update-alternatives \ --install %{_bindir}/kubectl kubectl %{_bindir}/kubectl%{baseversion} ${baseversion/./} -%postun client +%postun client-common if [ ! -f %{_bindir}/kubectl%{baseversion} ] ; then update-alternatives --remove kubectl %{_bindir}/kubectl%{baseversion} fi @@ -385,11 +392,15 @@ %files client %doc README.md CONTRIBUTING.md %license LICENSE -%{_mandir}/man1/kubectl.1%{?ext_man} -%{_mandir}/man1/kubectl-* %{_bindir}/kubectl %{_bindir}/kubectl%{baseversion} %ghost %_sysconfdir/alternatives/kubectl + +%files client-common +%doc README.md CONTRIBUTING.md +%license LICENSE +%{_mandir}/man1/kubectl.1%{?ext_man} +%{_mandir}/man1/kubectl-* %{_datadir}/bash-completion/completions/kubectl %changelog
