Accepting request 630733 from home:RBrownSUSE:branches:Virtualization:containers

Please stage with incoming cri-o, kubernetes, skelcd-control-kubic and patterns-caasp

OBS-URL: https://build.opensuse.org/request/show/630733
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=260

docker.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Aug 21 09:39:57 UTC 2018 - rbrown@suse.com
+
+- Kubic: Make crio default, docker as alternative runtime
+  (boo#1104821)
+- Provide kubernetes CRI config with docker-kubic-kubeadm-criconfig
+  subpackage
+
 -------------------------------------------------------------------
 Thu Aug 16 02:00:31 UTC 2018 - asarai@suse.com
 

docker.spec

@@ -65,6 +65,7 @@ Source1:        docker.service
 Source2:        docker-kubic-service.conf
 Source3:        80-docker.rules
 Source4:        sysconfig.docker
+Source5:        kubelet.env
 Source6:        docker-rpmlintrc
 Source7:        README_SUSE.md
 Source8:        docker-audit.rules
@@ -147,6 +148,8 @@ Obsoletes:      %{realname}_1_12_6
 # Conflict with non-kubic package, and provide equivalent
 Conflicts:      %{realname}
 Provides:       %{realname} = %{version}
+# Kubernetes requires cri-runtime, which should be provided only by the -kubic flavour of this package
+Provides:       cri-runtime
 %endif
 
 %description
@@ -229,6 +232,20 @@ Provides:       %{realname}-test = %{version}
 %description test
 Test package for docker. It contains the source code and the tests.
 
+%if "%flavour" == "kubic"
+%package kubeadm-criconfig
+Summary:        docker container runtime configuration for kubeadm
+Group:          System/Management
+Requires:       kubernetes-kubeadm
+Requires(post): %fillup_prereq
+Supplements:    docker-kubic
+Provides:       kubernetes-kubeadm-criconfig
+Conflicts:      cri-o-kubeadm-criconfig
+
+%description kubeadm-criconfig
+docker container runtime configuration for kubeadm
+%endif
+
 %prep
 %setup -q -n %{realname}-%{version}
 %if 0%{?is_opensuse}
@@ -368,6 +385,11 @@ install -p -m 644 components/cli/man/man5/Dockerfile.5 %{buildroot}%{_mandir}/ma
 install -d %{buildroot}%{_mandir}/man8
 install -p -m 644 components/cli/man/man8/*.8 %{buildroot}%{_mandir}/man8
 
+%if "%flavour" == "kubic"
+# place kubelet.env in fillupdir (for kubeadm-criconfig)
+install -D -m 0644 %{SOURCE5} %{buildroot}%{_fillupdir}/sysconfig.kubelet
+%endif
+
 %fdupes %{buildroot}
 
 %pre
@@ -389,6 +411,11 @@ getent group docker >/dev/null || groupadd -r docker
 	%service_del_postun containerd.service containerd.socket
 )
 
+%if "%flavour" == "kubic"
+%post kubeadm-criconfig
+%fillup_only -n kubelet
+%endif
+
 %preun
 %service_del_preun %{realname}.service
 
@@ -436,4 +463,10 @@ getent group docker >/dev/null || groupadd -r docker
 %exclude %{_prefix}/src/docker/engine/contrib/init/sysvinit-redhat
 %exclude %{_prefix}/src/docker/engine/contrib/init/upstart
 
+%if "%flavour" == "kubic"
+%files kubeadm-criconfig
+%defattr(-,root,root)
+%{_fillupdir}/sysconfig.kubelet
+%endif
+
 %changelog

kubelet.env

@@ -0,0 +1 @@
+KUBELET_EXTRA_ARGS="--cni-bin-dir=/usr/lib/cni"