Hello community, here is the log from the commit of package kubernetes for openSUSE:Factory checked in at 2019-04-15 11:51:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kubernetes (Old) and /work/SRC/openSUSE:Factory/.kubernetes.new.17052 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kubernetes" Mon Apr 15 11:51:47 2019 rev:41 rq:693685 version:1.14.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kubernetes/kubectl.changes 2019-04-04 11:58:38.901200722 +0200 +++ /work/SRC/openSUSE:Factory/.kubernetes.new.17052/kubectl.changes 2019-04-15 11:51:48.950529980 +0200 @@ -1,0 +2,10 @@ +Fri Apr 12 09:34:23 UTC 2019 - Richard Brown <[email protected]> + +- Fix go 1.12.1 BuildRequires + +------------------------------------------------------------------- +Thu Apr 11 21:16:45 UTC 2019 - Daniel Orf <[email protected]> + +- Reformat spec file with spec-cleaner + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/kubernetes/kubernetes.changes 2019-04-04 11:58:40.321201634 +0200 +++ /work/SRC/openSUSE:Factory/.kubernetes.new.17052/kubernetes.changes 2019-04-15 11:51:49.066530041 +0200 @@ -1,0 +2,12 @@ +Fri Apr 12 09:34:38 UTC 2019 - Richard Brown <[email protected]> + +- Fix go 1.12.1 BuildRequires + +------------------------------------------------------------------- +Thu Apr 11 21:17:51 UTC 2019 - Daniel Orf <[email protected]> + +- Reformat spec file with spec-cleaner +- Remove references to 'is_susecaasp' macro in spec file +- Remove unused config files related to previous version of CaaSP + +------------------------------------------------------------------- Old: ---- apiserver config controller-manager kubelet kubelet-config.yaml proxy scheduler ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kubectl.spec ++++++ --- /var/tmp/diff_new_pack.vmIJvB/_old 2019-04-15 11:51:51.158531149 +0200 +++ /var/tmp/diff_new_pack.vmIJvB/_new 2019-04-15 11:51:51.162531152 +0200 @@ -1,7 +1,7 @@ # -# spec file for package kubernetes +# spec file for package kubectl # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,45 +12,42 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %{!?tmpfiles_create:%global tmpfiles_create systemd-tmpfiles --create} - # baseversion - version of kubernetes for this package %define baseversion 1.14 - Name: kubectl Version: %{baseversion}.0 Release: 0 Summary: Kubectl (Kubernetes client tools) -Group: System/Management -Requires: bash-completion License: Apache-2.0 -Url: http://kubernetes.io +Group: System/Management +URL: http://kubernetes.io Source: kubernetes-%{version}.tar.xz Source2: genmanpages.sh Source28: kubernetes.obsinfo Source30: kubectl-rpmlintrc # Patches so it also builds in ppc64le and arm64. Patch1: git-upstream.patch - BuildRequires: bash-completion -BuildRequires: git BuildRequires: fdupes +BuildRequires: git BuildRequires: go-go-md2man -BuildRequires: golang-packaging -BuildRequires: rsync -BuildRequires: systemd-rpm-macros # Kubernetes 1.14.0 requires at least go 1.12.1 (see changelog) BuildRequires: golang(API) = 1.12 BuildRequires: go >= 1.12.1 BuildRequires: golang(github.com/jteeuwen/go-bindata) -ExcludeArch: %ix86 s390 +BuildRequires: golang-packaging +BuildRequires: rsync +BuildRequires: systemd-rpm-macros +Requires: bash-completion # Conflict with kubernetes-client which already provides kubectl but as a link # to hyperkube, provided by kubernetes-common Conflicts: kubernetes-client +ExcludeArch: %{ix86} s390 %{go_nostrip} %{go_provides} @@ -61,8 +58,6 @@ It groups containers that make up an application into logical units for management and discovery. - - %prep %setup -q -n kubernetes-%{version} %patch1 -p1 @@ -70,7 +65,7 @@ %build # This is fixing bug bsc#1065972 -export KUBE_GIT_COMMIT=$(grep "commit:" %{S:28} | cut -d ":" -f2 | tr -d " ") +export KUBE_GIT_COMMIT=$(grep "commit:" %{SOURCE28} | cut -d ":" -f2 | tr -d " ") # KUBE_GIT_TREE_STATE="clean" indicates no changes since the git commit id # KUBE_GIT_TREE_STATE="dirty" indicates source code changes after the git commit id export KUBE_GIT_TREE_STATE="clean" @@ -80,8 +75,8 @@ %ifarch ppc64le export GOLDFLAGS='-linkmode=external' %endif -make WHAT="cmd/hyperkube cmd/kubeadm test/e2e/e2e.test" -make ginkgo +make %{?_smp_mflags} WHAT="cmd/hyperkube cmd/kubeadm test/e2e/e2e.test" +make %{?_smp_mflags} ginkgo # The majority of the documentation has already been moved into # http://kubernetes.io/docs/admin, and most of the files stored in the `docs` @@ -122,10 +117,9 @@ %fdupes -s %{buildroot} %files -%defattr(-,root,root) %doc README.md CONTRIBUTING.md %license LICENSE -%{_mandir}/man1/kubectl.1* +%{_mandir}/man1/kubectl.1%{?ext_man} %{_mandir}/man1/kubectl-* %{_bindir}/kubectl %{_datadir}/bash-completion/completions/kubectl ++++++ kubernetes.spec ++++++ --- /var/tmp/diff_new_pack.vmIJvB/_old 2019-04-15 11:51:51.186531165 +0200 +++ /var/tmp/diff_new_pack.vmIJvB/_new 2019-04-15 11:51:51.186531165 +0200 @@ -1,7 +1,7 @@ # # spec file for package kubernetes # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,25 +12,22 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %{!?tmpfiles_create:%global tmpfiles_create systemd-tmpfiles --create} - # baseversion - version of kubernetes for this package %define baseversion 1.14 - # maxcriversion - version of cri-tools which is notsupported by this version of kubeadm. %define maxcriversion 1.15 - Name: kubernetes Version: %{baseversion}.0 Release: 0 Summary: Container Scheduling and Management License: Apache-2.0 Group: System/Management -Url: http://kubernetes.io +URL: http://kubernetes.io Source: %{name}-%{version}.tar.xz Source2: genmanpages.sh #systemd services @@ -46,31 +43,20 @@ Source26: kubernetes.tmp.conf Source27: kubernetes-rpmlintrc Source28: kubernetes.obsinfo - -# Configuration files used for CaaSP -Source31: apiserver -Source32: config -Source33: controller-manager -Source34: kubelet -Source35: kubelet-config.yaml -Source36: proxy -Source37: scheduler - # Patches so it also builds in ppc64le and arm64. Patch1: git-upstream.patch - BuildRequires: bash-completion -BuildRequires: git BuildRequires: fdupes +BuildRequires: git BuildRequires: go-go-md2man -BuildRequires: golang-packaging -BuildRequires: rsync -BuildRequires: systemd-rpm-macros # Kubernetes 1.14.0 requires at least go 1.12.1 (see changelog) BuildRequires: golang(API) = 1.12 BuildRequires: go >= 1.12.1 BuildRequires: golang(github.com/jteeuwen/go-bindata) -ExcludeArch: %ix86 s390 +BuildRequires: golang-packaging +BuildRequires: rsync +BuildRequires: systemd-rpm-macros +ExcludeArch: %{ix86} s390 %{go_nostrip} %{go_provides} @@ -95,14 +81,14 @@ Summary: Kubernetes services for master host Group: System/Management Requires: kubernetes-common = %{version}-%{release} -%if 0%{?suse_version} -Recommends: kubernetes-client = %{version}-%{release} -%endif Requires(pre): shadow # if the master is installed with node, version and release must be the same Conflicts: kubernetes-node < %{version}-%{release} Conflicts: kubernetes-node > %{version}-%{release} %{?systemd_requires} +%if 0%{?suse_version} +Recommends: kubernetes-client = %{version}-%{release} +%endif %description master Kubernetes is a system for automating deployment, scaling, and @@ -116,9 +102,6 @@ Requires: cri-runtime Requires: kubernetes-common = %{version}-%{release} Requires(pre): shadow -%if 0%{?is_susecaasp} -Requires(post): snapper -%endif # if master is installed with node, version and release must be the same Conflicts: kubernetes-master < %{version}-%{release} Conflicts: kubernetes-master > %{version}-%{release} @@ -132,15 +115,15 @@ Summary: Kubernetes kubeadm bootstrapping tool Group: System/Management Requires: cri-runtime -Requires: kubernetes-kubeadm-criconfig +Requires: cri-tools >= %{baseversion} Requires: ebtables Requires: ethtool Requires: kubernetes-common = %{version}-%{release} +Requires: kubernetes-kubeadm-criconfig Requires: kubernetes-kubelet = %{version}-%{release} -Requires: cri-tools >= %{baseversion} -Conflicts: cri-tools >= %{maxcriversion} Requires: socat Requires(pre): shadow +Conflicts: cri-tools >= %{maxcriversion} # if master is installed with node, version and release must be the same Conflicts: kubernetes-master < %{version}-%{release} Conflicts: kubernetes-master > %{version}-%{release} @@ -193,13 +176,13 @@ providers, demos, testsuite... %prep -%setup -q -n %{name}-%{version} +%setup -q %patch1 -p1 %{goprep} github.com/kubernetes/kubernetes %build # This is fixing bug bsc#1065972 -export KUBE_GIT_COMMIT=$(grep "commit:" %{S:28} | cut -d ":" -f2 | tr -d " ") +export KUBE_GIT_COMMIT=$(grep "commit:" %{SOURCE28} | cut -d ":" -f2 | tr -d " ") # KUBE_GIT_TREE_STATE="clean" indicates no changes since the git commit id # KUBE_GIT_TREE_STATE="dirty" indicates source code changes after the git commit id export KUBE_GIT_TREE_STATE="clean" @@ -209,8 +192,8 @@ %ifarch ppc64le export GOLDFLAGS='-linkmode=external' %endif -make WHAT="cmd/hyperkube cmd/kubeadm test/e2e/e2e.test" -make ginkgo +make %{?_smp_mflags} WHAT="cmd/hyperkube cmd/kubeadm test/e2e/e2e.test" +make %{?_smp_mflags} ginkgo # The majority of the documentation has already been moved into # http://kubernetes.io/docs/admin, and most of the files stored in the `docs` @@ -285,14 +268,6 @@ install -d %{buildroot}%{_mandir}/man1 install -p -m 644 docs/man/man1/* %{buildroot}%{_mandir}/man1 -%if 0%{?is_susecaasp} -# install config files for CaaSP -install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name} -for src in %{SOURCE31} %{SOURCE32} %{SOURCE33} %{SOURCE34} %{SOURCE35} %{SOURCE36} %{SOURCE37} do - install -m 0644 -t %{buildroot}%{_sysconfdir}/%{name} "$src" -done -%endif - # create config folder install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name} @@ -330,9 +305,9 @@ -c "Kubernetes user" kube %service_add_pre kube-apiserver.service kube-controller-manager.service kube-scheduler.service -mkdir -p -m 755 /var/lib/kubernetes -chown -R kube /var/lib/kubernetes -chgrp -R kube /var/lib/kubernetes +mkdir -p -m 755 %{_localstatedir}/lib/kubernetes +chown -R kube %{_localstatedir}/lib/kubernetes +chgrp -R kube %{_localstatedir}/lib/kubernetes %post master %service_add_post kube-apiserver.service kube-controller-manager.service kube-scheduler.service @@ -354,9 +329,9 @@ %service_add_post kubelet.service %if 0%{?suse_version} < 1500 # create some subvolumes needed by CNI -if [ ! -e /var/lib/cni ]; then +if [ ! -e %{_localstatedir}/lib/cni ]; then if [ "`findmnt -o FSTYPE -l /|grep -v FSTYPE`" = "btrfs" ]; then - /usr/sbin/mksubvolume /var/lib/cni + %{_sbindir}/mksubvolume %{_localstatedir}/lib/cni fi fi %endif @@ -381,20 +356,15 @@ %service_del_postun kube-proxy.service %files common -%defattr(-,root,root) -%if 0%{?is_susecaasp} -%config(noreplace) %{_sysconfdir}/%{name}/config -%endif %{_bindir}/hyperkube %files master -%defattr(-,root,root) %doc README.md CONTRIBUTING.md %license LICENSE -%{_mandir}/man1/kube-apiserver.1* -%{_mandir}/man1/kube-controller-manager.1* -%{_mandir}/man1/kube-scheduler.1* -%{_mandir}/man1/cloud-controller-manager.1* +%{_mandir}/man1/kube-apiserver.1%{?ext_man} +%{_mandir}/man1/kube-controller-manager.1%{?ext_man} +%{_mandir}/man1/kube-scheduler.1%{?ext_man} +%{_mandir}/man1/cloud-controller-manager.1%{?ext_man} %{_bindir}/kube-apiserver %{_bindir}/kube-controller-manager %{_bindir}/kube-scheduler @@ -407,18 +377,12 @@ %attr(0750,root,root) %dir %ghost %{_rundir}/%{name} %dir %{_sysconfdir}/%{name} -%if 0%{?is_susecaasp} -%config(noreplace) %{_sysconfdir}/%{name}/apiserver -%config(noreplace) %{_sysconfdir}/%{name}/controller-manager -%config(noreplace) %{_sysconfdir}/%{name}/scheduler -%endif %{_tmpfilesdir}/kubernetes.conf %files kubelet -%defattr(-,root,root) %doc README.md CONTRIBUTING.md CHANGELOG-%{baseversion}.md %license LICENSE -%{_mandir}/man1/kubelet.1* +%{_mandir}/man1/kubelet.1%{?ext_man} %{_bindir}/kubelet %{_unitdir}/kubelet.service %dir %{_unitdir}/kubelet.service.d @@ -426,17 +390,12 @@ %dir %{_localstatedir}/lib/kubelet %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/manifests -%if 0%{?is_susecaasp} -%config(noreplace) %{_sysconfdir}/%{name}/kubelet -%config(noreplace) %{_sysconfdir}/%{name}/kubelet-config.yaml -%endif %{_tmpfilesdir}/%{name}.conf %attr(0750,root,root) %dir %ghost %{_rundir}/%{name} %dir %{_libexecdir}/kubernetes %dir %{_libexecdir}/kubernetes/kubelet-plugins %files kubeadm -%defattr(-,root,root) %doc README.md CONTRIBUTING.md CHANGELOG-%{baseversion}.md %{_unitdir}/kubelet.service.d/10-kubeadm.conf %dir %{_libexecdir}/modules-load.d @@ -448,30 +407,24 @@ %{_mandir}/man1/kubeadm* %files node -%defattr(-,root,root) %doc README.md CONTRIBUTING.md CHANGELOG-%{baseversion}.md %license LICENSE -%{_mandir}/man1/kube-proxy.1* +%{_mandir}/man1/kube-proxy.1%{?ext_man} %{_bindir}/kube-proxy %{_unitdir}/kube-proxy.service %{_sbindir}/rckube-proxy %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/manifests -%if 0%{?is_susecaasp} -%config(noreplace) %{_sysconfdir}/%{name}/proxy -%endif %files client -%defattr(-,root,root) %doc README.md CONTRIBUTING.md %license LICENSE -%{_mandir}/man1/kubectl.1* +%{_mandir}/man1/kubectl.1%{?ext_man} %{_mandir}/man1/kubectl-* %{_bindir}/kubectl %{_datadir}/bash-completion/completions/kubectl %files extra -%defattr(-,root,root) %dir %{_usrsrc}/kubernetes %dir %{_usrsrc}/kubernetes/cluster %dir %{_usrsrc}/kubernetes/hack
