Hello community,
here is the log from the commit of package kubernetes1.18 for openSUSE:Factory
checked in at 2020-11-13 18:55:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kubernetes1.18 (Old)
and /work/SRC/openSUSE:Factory/.kubernetes1.18.new.24930 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kubernetes1.18"
Fri Nov 13 18:55:22 2020 rev:13 rq:847536 version:1.18.10
Changes:
--------
--- /work/SRC/openSUSE:Factory/kubernetes1.18/kubernetes1.18.changes
2020-10-18 16:31:40.240764534 +0200
+++ /work/SRC/openSUSE:Factory/.kubernetes1.18.new.24930/kubernetes1.18.changes
2020-11-13 18:55:52.125895563 +0100
@@ -1,0 +2,5 @@
+Tue Nov 10 08:56:41 UTC 2020 - David Cassany <dcass...@suse.com>
+
+- Build only kubernetes client subpackages on SLE
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kubernetes1.18.spec ++++++
--- /var/tmp/diff_new_pack.qyYrKA/_old 2020-11-13 18:55:54.161897826 +0100
+++ /var/tmp/diff_new_pack.qyYrKA/_new 2020-11-13 18:55:54.161897826 +0100
@@ -71,6 +71,7 @@
# packages to build containerized control plane
+%if 0%{?sle_version} == 0 || 0%{?is_opensuse}
%package apiserver
Summary: Kubernetes apiserver for container image
Group: System/Management
@@ -153,6 +154,7 @@
%description kubeadm
Manage a cluster of Linux containers as a single system to accelerate Dev and
simplify Ops.
kubeadm bootstrapping tool
+%endif
%package client
Summary: Kubernetes client tools
@@ -161,6 +163,8 @@
Requires: kubernetes-client-common >= %{version}
Requires(post): update-alternatives
Requires(postun): update-alternatives
+Conflicts: kubernetes-client < %{baseversion}
+Obsoletes: kubernetes-%{baseversion}-client < %{version}
%description client
Kubernetes client tools like kubectl.
@@ -197,7 +201,11 @@
%endif
#TEST
+%if 0%{?sle_version} == 0 || 0%{?is_opensuse}
make WHAT="cmd/kube-apiserver cmd/kube-controller-manager cmd/kube-scheduler
cmd/kube-proxy cmd/kubelet cmd/kubectl cmd/kubeadm" GOFLAGS="-buildmode=pie"
+%else
+make WHAT="cmd/kubectl" GOFLAGS="-buildmode=pie"
+%endif
# The majority of the documentation has already been moved into
# http://kubernetes.io/docs/admin, and most of the files stored in the `docs`
@@ -206,9 +214,11 @@
# let's do that and run `genmanpages.sh`.
./hack/generate-docs.sh || true
pushd docs
+%if 0%{?sle_version} == 0 || 0%{?is_opensuse}
pushd admin
cp kube-apiserver.md kube-controller-manager.md kube-proxy.md
kube-scheduler.md kubelet.md ..
popd
+%endif
cp %{SOURCE2} genmanpages.sh
bash genmanpages.sh
popd
@@ -223,6 +233,7 @@
install -m 755 -d %{buildroot}%{_bindir}
+%if 0%{?sle_version} == 0 || 0%{?is_opensuse}
echo "+++ INSTALLING kubeadm"
install -p -m 755 -t %{buildroot}%{_bindir} ${output_path}/kubeadm
@@ -232,17 +243,21 @@
install -p -m 755 -t %{buildroot}%{_bindir} ${output_path}/${bin}
done
-for bin in kubelet kubectl; do
- echo "+++ INSTALLING ${bin} with %{baseversion} suffix"
- install -p -m 755 ${output_path}/${bin}
%{buildroot}%{_bindir}/${bin}%{baseversion}
-done
+echo "+++ INSTALLING kubelet with %{baseversion} suffix"
+install -p -m 755 ${output_path}/kubelet
%{buildroot}%{_bindir}/kubelet%{baseversion}
+%endif
+
+echo "+++ INSTALLING kubectl with %{baseversion} suffix"
+install -p -m 755 ${output_path}/kubectl
%{buildroot}%{_bindir}/kubectl%{baseversion}
+%if 0%{?sle_version} == 0 || 0%{?is_opensuse}
echo "+++ INSTALLING kubelet multi-version loader"
install -p -m 755 %{SOURCE3} %{buildroot}%{_bindir}/kubelet
# create sysconfig.kubelet-kubernetes in fullupdir
sed -i -e 's|BASE_VERSION|%{baseversion}|g' %{SOURCE22}
install -D -m 0644 %{SOURCE22}
%{buildroot}%{_fillupdir}/sysconfig.kubelet-kubernetes%{baseversion}
+%endif
# install the bash completion
install -d -m 0755 %{buildroot}%{_datadir}/bash-completion/completions/
@@ -257,6 +272,7 @@
find hack -name '*.sh.orig' -type f -delete
find hack -name '.golint_*' -type f -delete
+%if 0%{?sle_version} == 0 || 0%{?is_opensuse}
# systemd service
install -d -m 0755 %{buildroot}%{_unitdir}
install -m 0644 -t %{buildroot}%{_unitdir}/ %{SOURCE10}
@@ -268,7 +284,13 @@
# install manpages
install -d %{buildroot}%{_mandir}/man1
install -p -m 644 docs/man/man1/* %{buildroot}%{_mandir}/man1
+%else
+# install kubectl manpages
+install -d %{buildroot}%{_mandir}/man1
+install -p -m 644 docs/man/man1/kubectl* %{buildroot}%{_mandir}/man1
+%endif
+%if 0%{?sle_version} == 0 || 0%{?is_opensuse}
# create config folder
install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}
@@ -295,6 +317,7 @@
install -d -m 0755 %{buildroot}%{_unitdir}/kubelet.service.d
sed -i -e 's|PATH_TO_FLEXVOLUME|%{volume_plugin_dir}|g' %{SOURCE25}
install -m 0644 -t %{buildroot}%{_unitdir}/kubelet.service.d/ %{SOURCE25}
+%endif
# alternatives
ln -s -f %{_sysconfdir}/alternatives/kubectl %{buildroot}%{_bindir}/kubectl
@@ -311,6 +334,7 @@
update-alternatives --remove kubectl %{_bindir}/kubectl%{baseversion}
fi
+%if 0%{?sle_version} == 0 || 0%{?is_opensuse}
%pre kubelet-common
%service_add_pre kubelet.service
@@ -389,6 +413,7 @@
%license LICENSE
%{_bindir}/kubeadm
%{_mandir}/man1/kubeadm*
+%endif
%files client
%doc README.md CONTRIBUTING.md
_______________________________________________
openSUSE Commits mailing list -- commit@lists.opensuse.org
To unsubscribe, email commit-le...@lists.opensuse.org
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives:
https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
