Hello community,
here is the log from the commit of package kubernetes for openSUSE:Factory
checked in at 2018-09-05 13:45:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kubernetes (Old)
and /work/SRC/openSUSE:Factory/.kubernetes.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kubernetes"
Wed Sep 5 13:45:05 2018 rev:30 rq:630738 version:1.11.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/kubernetes/kubernetes.changes 2018-08-15
10:36:55.940131722 +0200
+++ /work/SRC/openSUSE:Factory/.kubernetes.new/kubernetes.changes
2018-09-05 13:45:07.101921039 +0200
@@ -1,0 +2,9 @@
+Tue Aug 14 16:38:57 UTC 2018 - rbr...@suse.com
+
+- Make crio default, docker as alternative runtime (boo#1104821)
+- Configure kubernetes CRI runtime with $runtime-kubeadm-criconfig
+ packages
+- Remove /etc/sysconfig/kubelet, now provided by
+ $runtime-kubeadm-criconfig packages
+
+-------------------------------------------------------------------
Old:
----
kubelet.env
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kubernetes.spec ++++++
--- /var/tmp/diff_new_pack.iPBqAI/_old 2018-09-05 13:45:08.601923273 +0200
+++ /var/tmp/diff_new_pack.iPBqAI/_new 2018-09-05 13:45:08.605923278 +0200
@@ -40,7 +40,6 @@
Source13: kube-proxy.service
Source14: kube-scheduler.service
#config files
-Source24: kubelet.env
Source25: 10-kubeadm.conf
Source26: kubernetes.tmp.conf
Source27: kubernetes-rpmlintrc
@@ -106,7 +105,7 @@
%package kubelet
Summary: Kubernetes kubelet daemon
Group: System/Management
-Requires: docker-kubic
+Requires: cri-runtime
Requires: kubernetes-common = %{version}-%{release}
Requires(pre): shadow
%if 0%{?is_susecaasp}
@@ -124,7 +123,8 @@
%package kubeadm
Summary: Kubernetes kubeadm bootstrapping tool
Group: System/Management
-Requires: docker-kubic
+Requires: cri-runtime
+Requires: kubernetes-kubeadm-criconfig
Requires: ebtables
Requires: ethtool
Requires: kubernetes-common = %{version}-%{release}
@@ -133,7 +133,6 @@
Conflicts: cri-tools >= %{maxcriversion}
Requires: socat
Requires(pre): shadow
-Requires(post): %fillup_prereq
# if master is installed with node, version and release must be the same
Conflicts: kubernetes-master < %{version}-%{release}
Conflicts: kubernetes-master > %{version}-%{release}
@@ -146,7 +145,7 @@
Summary: Kubernetes services for node host
Group: System/Management
Requires: conntrack-tools
-Requires: docker-kubic
+Requires: cri-runtime
Requires: ethtool
Requires: iptables
Requires: kubernetes-common = %{version}-%{release}
@@ -284,9 +283,6 @@
# create config folder
install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}
-# place kubelet.env in fillupdir
-install -D -m 0644 %{SOURCE24} %{buildroot}%{_fillupdir}/sysconfig.kubelet
-
# manifests file for the kubelet
install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}/manifests
@@ -336,7 +332,6 @@
%service_add_pre kubelet.service
%post kubelet
-%fillup_only -n kubelet
%service_add_post kubelet.service
%if 0%{?suse_version} < 1500
# create some subvolumes needed by CNI
@@ -404,7 +399,6 @@
%dir %{_localstatedir}/lib/kubelet
%dir %{_sysconfdir}/%{name}
%dir %{_sysconfdir}/%{name}/manifests
-%{_fillupdir}/sysconfig.kubelet
%{_tmpfilesdir}/%{name}.conf
%attr(0750,root,root) %dir %ghost %{_rundir}/%{name}
%dir %{_libexecdir}/kubernetes
++++++ 10-kubeadm.conf ++++++
--- /var/tmp/diff_new_pack.iPBqAI/_old 2018-09-05 13:45:08.657923356 +0200
+++ /var/tmp/diff_new_pack.iPBqAI/_new 2018-09-05 13:45:08.661923362 +0200
@@ -9,4 +9,3 @@
EnvironmentFile=-/etc/sysconfig/kubelet
ExecStart=
ExecStart=/usr/bin/kubelet $KUBELET_KUBECONFIG_ARGS $KUBELET_CONFIG_ARGS
$KUBELET_KUBEADM_ARGS $KUBELET_EXTRA_ARGS
-
