Hello community, here is the log from the commit of package kubernetes for openSUSE:Factory checked in at 2018-08-02 14:59:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kubernetes (Old) and /work/SRC/openSUSE:Factory/.kubernetes.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kubernetes" Thu Aug 2 14:59:56 2018 rev:26 rq:626939 version:1.10.5 Changes: -------- New Changes file: --- /dev/null 2018-07-30 18:06:19.633948440 +0200 +++ /work/SRC/openSUSE:Factory/.kubernetes.new/kubectl.changes 2018-08-02 15:00:46.988544799 +0200 @@ -0,0 +1,21 @@ +------------------------------------------------------------------- +Wed Aug 1 14:00:52 UTC 2018 - [email protected] + +- Add a conflict with kubernetes-client. Both packages provide kubectl + but in kubernetes-client kubectl is a link to hyperkube, from + kubernetes-common. + +------------------------------------------------------------------- +Thu Jul 19 11:42:17 UTC 2018 - [email protected] + +- Get the commit id from the obsinfo file. + This way this is automatic and we don't have a regression + of bsc#1065972 + +------------------------------------------------------------------- +Mon Jul 16 18:16:49 UTC 2018 - [email protected] + +- initial commit in order to split kubectl package + (fix bsc#1097473 and bsc#1101010 and fate#325820) + + add lintrc filter to avoid conflict with kubernetes-client package which is built in SLE12 but not shipped in SLE12 --- /work/SRC/openSUSE:Factory/kubernetes/kubernetes.changes 2018-07-18 22:56:40.186417715 +0200 +++ /work/SRC/openSUSE:Factory/.kubernetes.new/kubernetes.changes 2018-08-02 15:00:48.800547868 +0200 @@ -1,0 +2,30 @@ +Mon Jul 23 07:05:05 UTC 2018 - [email protected] + +- Fix kubelet-config.yaml by adding authentication and authorization section + +------------------------------------------------------------------- +Fri Jul 20 08:51:58 UTC 2018 - [email protected] + +- Include kubectl-rpmlintrc and kubelet-config.yaml files into kubernetes.spec + and kubectl.spec + +------------------------------------------------------------------- +Thu Jul 19 11:40:36 UTC 2018 - [email protected] + +- Get the commit id from the obsinfo file. + This way this is automatic and we don't have a regression + of bsc#1065972 + +------------------------------------------------------------------- +Thu Jul 19 10:05:12 UTC 2018 - [email protected] + +- Move deprecated options to kubelet-config.yaml for kubelet service + * add file kubelet-config.yaml + +------------------------------------------------------------------- +Wed Jul 18 11:49:45 UTC 2018 - [email protected] + +- Add kubectl.spec file so we can create the kubectl package separetely + (fix bsc#1097473 and bsc#1101010 and fate#325820) + +------------------------------------------------------------------- Old: ---- kubernetes-1.10.5+32ac1c9073b132b8ba18aa830f46b77dcceb0723.tar.xz New: ---- kubectl-rpmlintrc kubectl.changes kubectl.spec kubelet-config.yaml kubernetes-1.10.5.tar.xz kubernetes.obsinfo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kubectl.spec ++++++ # # spec file for package kubernetes # # Copyright (c) 2017 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # 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/ # %{!?tmpfiles_create:%global tmpfiles_create systemd-tmpfiles --create} Name: kubectl Version: 1.10.5 Release: 0 Summary: Kubectl (Kubernetes client tools) Group: System/Management Requires: bash-completion License: Apache-2.0 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 Patch4: make-e2e_node-run-over-distro-bins.patch Patch6: build-with-debug-info.patch Patch7: do-not-gc-sle-kubic-images.patch BuildRequires: bash-completion BuildRequires: git BuildRequires: fdupes BuildRequires: go-go-md2man BuildRequires: golang-packaging BuildRequires: rsync BuildRequires: systemd-rpm-macros # Kubernetes 1.9 requires at least go 1.9.3 (see changelog) BuildRequires: golang(API) = 1.9 BuildRequires: go >= 1.9.3 BuildRequires: golang(github.com/jteeuwen/go-bindata) ExcludeArch: %ix86 s390 # Conflict with kubernetes-client which already provides kubectl but as a link # to hyperkube, provided by kubernetes-common Conflicts: kubernetes-client %{go_nostrip} %{go_provides} %description Kubectl (Kubernetes client tool). This package contains only the kubectl tool so it can be distributed and installed without any other kubernetes package. It groups containers that make up an application into logical units for management and discovery. %prep %setup -q -n kubernetes-%{version} %patch1 -p1 %patch4 -p1 %patch6 -p1 %patch7 -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 " ") # 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" export KUBE_GIT_VERSION=v%{version} # https://bugzilla.redhat.com/show_bug.cgi?id=1392922#c1 %ifarch ppc64le export GOLDFLAGS='-linkmode=external' %endif make WHAT="--use_go_build cmd/hyperkube cmd/kubeadm test/e2e/e2e.test" make 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` # directory simply point there. That being said, some of the files are actual # man pages, but they have to be generated with `hack/generate-docs.sh`. So, # let's do that and run `genmanpages.sh`. ./hack/generate-docs.sh || true pushd docs cp %{SOURCE2} genmanpages.sh bash genmanpages.sh popd %install %ifarch ppc64le aarch64 output_path="_output/local/go/bin" %else output_path="_output/local/bin/linux/%{go_arch}" %endif install -m 755 -d %{buildroot}%{_bindir} cp ${output_path}/hyperkube %{buildroot}%{_bindir}/kubectl # install the bash completion install -d -m 0755 %{buildroot}%{_datadir}/bash-completion/completions/ %{buildroot}%{_bindir}/kubectl completion bash > %{buildroot}%{_datadir}/bash-completion/completions/kubectl # cleanup before copying dirs... rm -f hack/.linted_packages find . -name '.gitignore' -type f -delete find hack -name '*.sh.orig' -type f -delete find hack -name '.golint_*' -type f -delete # install manpages install -d %{buildroot}%{_mandir}/man1 install -p -m 644 docs/man/man1/kubectl* %{buildroot}%{_mandir}/man1 %fdupes -s %{buildroot} %files %defattr(-,root,root) %doc README.md CONTRIBUTING.md %license LICENSE %{_mandir}/man1/kubectl.1* %{_mandir}/man1/kubectl-* %{_bindir}/kubectl %{_datadir}/bash-completion/completions/kubectl %changelog ++++++ kubernetes.spec ++++++ --- /var/tmp/diff_new_pack.eKMbtC/_old 2018-08-02 15:00:52.676554430 +0200 +++ /var/tmp/diff_new_pack.eKMbtC/_new 2018-08-02 15:00:52.676554430 +0200 @@ -18,13 +18,6 @@ %{!?tmpfiles_create:%global tmpfiles_create systemd-tmpfiles --create} -# After executing `osc service disabledrun` command, -# please strip Version: from commit_id (commit_id has to -# be defined as seperate value). -# This is fixing bug bsc#1065972 -# https://bugzilla.suse.com/show_bug.cgi?id=1065972 -%define commit_id 32ac1c9073b132b8ba18aa830f46b77dcceb0723 - Name: kubernetes Version: 1.10.5 Release: 0 @@ -32,7 +25,7 @@ License: Apache-2.0 Group: System/Management Url: http://kubernetes.io -Source: %{name}-%{version}+%{commit_id}.tar.xz +Source: %{name}-%{version}.tar.xz Source2: genmanpages.sh #systemd services Source10: kube-apiserver.service @@ -49,6 +42,9 @@ Source25: scheduler Source26: kubernetes.tmp.conf Source27: kubernetes-rpmlintrc +Source28: kubernetes.obsinfo +Source29: kubelet-config.yaml + # Patches so it also builds in ppc64le and arm64. Patch1: git-upstream.patch Patch4: make-e2e_node-run-over-distro-bins.patch @@ -187,7 +183,7 @@ providers, demos, testsuite... %prep -%setup -q -n %{name}-%{version}+%{commit_id} +%setup -q -n %{name}-%{version} %patch1 -p1 %patch4 -p1 %patch6 -p1 @@ -196,7 +192,8 @@ %{goprep} github.com/kubernetes/kubernetes %build -export KUBE_GIT_COMMIT=%{commit_id} +# This is fixing bug bsc#1065972 +export KUBE_GIT_COMMIT=$(grep "commit:" %{S:28} | 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" @@ -284,7 +281,7 @@ # install config files install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name} -for src in %{SOURCE20} %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24} %{SOURCE25} ; do +for src in %{SOURCE20} %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24} %{SOURCE25} %{SOURCE29}; do install -m 0644 -t %{buildroot}%{_sysconfdir}/%{name} "$src" done @@ -404,6 +401,7 @@ %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/manifests %config(noreplace) %{_sysconfdir}/%{name}/kubelet +%config(noreplace) %{_sysconfdir}/%{name}/kubelet-config.yaml %{_tmpfilesdir}/%{name}.conf %attr(0750,root,root) %dir %ghost %{_rundir}/%{name} %dir %{_libexecdir}/kubernetes ++++++ _service ++++++ --- /var/tmp/diff_new_pack.eKMbtC/_old 2018-08-02 15:00:52.712554491 +0200 +++ /var/tmp/diff_new_pack.eKMbtC/_new 2018-08-02 15:00:52.716554498 +0200 @@ -3,7 +3,7 @@ <param name="url">https://github.com/kubernetes/kubernetes.git</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="versionformat">1.10.5+%H</param> + <param name="versionformat">1.10.5</param> <param name="revision">v1.10.5</param> <param name="changesgenerate">enable</param> </service> ++++++ kubectl-rpmlintrc ++++++ addFilter("SUSE-Backports-policy-SLE-conflict") ++++++ kubelet ++++++ --- /var/tmp/diff_new_pack.eKMbtC/_old 2018-08-02 15:00:52.880554775 +0200 +++ /var/tmp/diff_new_pack.eKMbtC/_new 2018-08-02 15:00:52.880554775 +0200 @@ -1,9 +1,11 @@ ### # kubernetes kubelet (minion) config +# DEPRECATED!!! This option was moved to kubelet-config.yaml # The address for the info server to serve on (set to 0.0.0.0 or "" for all interfaces) -KUBELET_ADDRESS="--address=127.0.0.1" +#KUBELET_ADDRESS="--address=127.0.0.1" +# DEPRECATED!!! This option was moved to kubelet-config.yaml # The port for the info server to serve on # KUBELET_PORT="--port=10250" @@ -11,4 +13,4 @@ KUBELET_HOSTNAME="--hostname-override=127.0.0.1" # Add your own! -KUBELET_ARGS="--pod-manifest-path=/etc/kubernetes/manifests --volume-plugin-dir=/usr/lib/kubernetes/kubelet-plugins" +KUBELET_ARGS="--config=/etc/kubernetes/kubelet-config.yaml --volume-plugin-dir=/usr/lib/kubernetes/kubelet-plugins" ++++++ kubelet-config.yaml ++++++ kind: KubeletConfiguration apiVersion: kubelet.config.k8s.io/v1beta1 staticPodPath: "/etc/kubernetes/manifests" address: 127.0.0.1 port: 10250 authentication: webhook: enabled: false anonymous: enabled: true authorization: mode: AlwaysAllow ++++++ kubernetes-1.10.5+32ac1c9073b132b8ba18aa830f46b77dcceb0723.tar.xz -> kubernetes-1.10.5.tar.xz ++++++ /work/SRC/openSUSE:Factory/kubernetes/kubernetes-1.10.5+32ac1c9073b132b8ba18aa830f46b77dcceb0723.tar.xz /work/SRC/openSUSE:Factory/.kubernetes.new/kubernetes-1.10.5.tar.xz differ: char 25, line 1 ++++++ kubernetes.obsinfo ++++++ name: kubernetes version: 1.10.5 mtime: 1529428532 commit: 32ac1c9073b132b8ba18aa830f46b77dcceb0723
