Hello community, here is the log from the commit of package kubernetes for openSUSE:Factory checked in at 2017-05-20 10:13:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kubernetes (Old) and /work/SRC/openSUSE:Factory/.kubernetes.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kubernetes" Sat May 20 10:13:30 2017 rev:2 rq:495530 version:1.6.1 Changes: -------- --- /work/SRC/openSUSE:Factory/kubernetes/kubernetes.changes 2017-02-05 18:36:18.955220578 +0100 +++ /work/SRC/openSUSE:Factory/.kubernetes.new/kubernetes.changes 2017-05-20 10:13:39.275956720 +0200 @@ -1,0 +2,94 @@ +Mon May 15 16:54:22 UTC 2017 - robert.roland@suse.com + +- Adding a /etc/kubernetes/kubelet-initial EnvironmentFile that is expected + to set the KUBELET_INITIAL_ARGS variable so that a set of arguments that + only impact kubelet on the first run can be supplied. This removes the + need to restart kubelet when you change the node labels, for example. + +------------------------------------------------------------------- +Mon May 15 16:51:39 UTC 2017 - rroland@attachmate.com + +- Adding a /etc/kubernetes/kubelet-initial EnvironmentFile that is expected + to set the KUBELET_INITIAL_ARGS variable so that a set of arguments that + only impact kubelet on the first run can be supplied. This removes the + need to restart kubelet when you change the node labels, for example. + +------------------------------------------------------------------- +Tue Apr 11 21:17:36 UTC 2017 - jengelh@inai.de + +- Update descriptions + +------------------------------------------------------------------- +Thu Apr 06 14:18:26 UTC 2017 - opensuse-packaging@opensuse.org + +- Update to version 1.6.1: + * Bump cluster autoscaler to 0.5.1 + * Kubernetes version v1.6.1-beta.0 + * update-all.sh + * Better messaging when GKE certificate signing fails. + * Update busybox dependency to fix bazel build + * update-all.sh + * don't wait for first kubelet to be ready + * Fix problems of not-starting image pullers + * Kubernetes version v1.6.1 + +------------------------------------------------------------------- +Mon Apr 3 16:16:43 UTC 2017 - jmassaguerpla@suse.com + +- Remove get-rid-of-the-git-commands-in-mungedocs.patch: no mungedocs + Review patches: + * build-with-debug-info.patch + * fix-support-for-ppc64le.patch + * git-upstream.patch + * make-e2e_node-run-over-distro-bins.patch + +- Remove 0002-Change-DUP2-to-DUP3-in-contrib-mesos-to-build-on-arm.patch + because mesos has been moved to the incubator project: + https://github.com/kubernetes/kubernetes/pull/33658 + +------------------------------------------------------------------- +Mon Apr 03 11:45:52 UTC 2017 - opensuse-packaging@opensuse.org + +- Update to version 1.6.0: + * Kubernetes version v1.6.0-beta.0 + * Generating docs for v1.6.0-beta.0 on release-1.6. + * update-all.sh. + * update-all.sh. + * Kubernetes version v1.6.0-beta.1 + * update-staging-client-go.sh + * Kubernetes version v1.6.0-beta.2 + * update-all.sh. + * Kubernetes version v1.6.0-beta.3 + * update-all.sh. + * Kubernetes version v1.6.0-beta.4 + * update-staging-client-go.sh + * Update NPD rbac. + * Kubernetes version v1.6.0-rc.1 + * update-all.sh. + * Update a few regex patterns to support release candidates + * Added failing upgrade if there are many master replicas. + * added prompt warning if etcd3 media type isn't set during upgrade + * etcd upgrade warning: add docs link, fixed etcd2 behavior, print non-interactive + * in storage media upgrade prompt, provide config for using protobuf + * Kubernetes version v1.6.0 + +------------------------------------------------------------------- +Mon Mar 27 08:49:25 UTC 2017 - alvaro.saurin@suse.com + +- updated to to 1.5.5 + +------------------------------------------------------------------- +Wed Mar 15 15:47:07 UTC 2017 - alvaro.saurin@suse.com + +- updated to to 1.5.4 + +------------------------------------------------------------------- +Thu Feb 23 09:15:52 UTC 2017 - alvaro.saurin@suse.com + +- added some patches: +build-with-debug-info.patch, fix-support-for-ppc64le.patch, +get-rid-of-the-git-commands-in-mungedocs.patch, git-upstream.patch, +make-e2e_node-run-over-distro-bins.patch +- removed gcc-on-ppc64-and-arm.patch + +------------------------------------------------------------------- Old: ---- 0002-Change-DUP2-to-DUP3-in-contrib-mesos-to-build-on-arm.patch gcc-on-ppc64-and-arm.patch kubernetes-1.3.10.tar.xz New: ---- build-with-debug-info.patch fix-support-for-ppc64le.patch git-upstream.patch kubernetes-1.6.1.tar.xz make-e2e_node-run-over-distro-bins.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kubernetes.spec ++++++ --- /var/tmp/diff_new_pack.RPRoO7/_old 2017-05-20 10:13:40.395798496 +0200 +++ /var/tmp/diff_new_pack.RPRoO7/_new 2017-05-20 10:13:40.395798496 +0200 @@ -1,7 +1,7 @@ # # spec file for package kubernetes # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# 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 @@ -18,9 +18,9 @@ %{!?tmpfiles_create:%global tmpfiles_create systemd-tmpfiles --create} Name: kubernetes -Version: 1.3.10 +Version: 1.6.1 Release: 0 -Summary: Production-Grade Container Scheduling and Management +Summary: Container Scheduling and Management License: Apache-2.0 Group: System/Management Url: http://kubernetes.io @@ -42,52 +42,102 @@ Source26: kubernetes.tmp.conf Source27: kubernetes-rpmlintrc # Patches so it also builds in ppc64le and arm64. -Patch1: 0002-Change-DUP2-to-DUP3-in-contrib-mesos-to-build-on-arm.patch -Patch2: gcc-on-ppc64-and-arm.patch +Patch1: git-upstream.patch Patch3: add_pr_template.patch +Patch4: make-e2e_node-run-over-distro-bins.patch +Patch6: build-with-debug-info.patch +Patch7: fix-support-for-ppc64le.patch + BuildRequires: bash-completion +BuildRequires: git +BuildRequires: go >= 1.7 BuildRequires: go-go-md2man BuildRequires: golang-packaging BuildRequires: rsync BuildRequires: systemd-rpm-macros +BuildRequires: golang(github.com/jteeuwen/go-bindata) ExcludeArch: %ix86 %{go_nostrip} %{go_provides} %description -Manage a cluster of Linux containers as a single system to accelerate Dev and simplify Ops. +Kubernetes is a system for automating deployment, scaling, and +management of containerized applications. + +It groups containers that make up an application into logical units +for management and discovery. %package common Summary: Kubernetes common files +Group: System/Management %description common -Manage a cluster of Linux containers as a single system to accelerate Dev and simplify Ops. -Kubernetes common files +Kubernetes is a system for automating deployment, scaling, and +management of containerized applications. + +This subpackage contains the Kubernetes common files. %package master 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 -Requires(pre): openssl # 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} %description master +Kubernetes is a system for automating deployment, scaling, and +management of containerized applications. + +This subpackage contains the Kubernetes services for master hosts. + +%package kubelet +Summary: Kubernetes kubelet daemon +Group: System/Management +Requires: docker +Requires: kubernetes-common = %{version}-%{release} +Requires(pre): shadow +# if master is installed with node, version and release must be the same +Conflicts: kubernetes-master < %{version}-%{release} +Conflicts: kubernetes-master > %{version}-%{release} +%{?systemd_requires} + +%description kubelet +Manage a cluster of Linux containers as a single system to accelerate Dev and simplify Ops. +kubelet daemon + +%package kubeadm +Summary: Kubernetes kubeadm bootstrapping tool +Group: System/Management +Requires: docker +Requires: ebtables +Requires: ethtool +Requires: kubernetes-common = %{version}-%{release} +Requires: socat +Requires(pre): shadow +# if master is installed with node, version and release must be the same +Conflicts: kubernetes-master < %{version}-%{release} +Conflicts: kubernetes-master > %{version}-%{release} + +%description kubeadm Manage a cluster of Linux containers as a single system to accelerate Dev and simplify Ops. -Kubernetes services for master host +kubeadm bootstrapping tool %package node Summary: Kubernetes services for node host -Requires: kubernetes-common = %{version}-%{release} +Group: System/Management +Requires: conntrack-tools Requires: docker Requires: ethtool -Requires: socat Requires: iptables +Requires: kubernetes-common = %{version}-%{release} +Requires: kubernetes-kubelet = %{version}-%{release} +Requires: socat Requires(pre): shadow # if master is installed with node, version and release must be the same Conflicts: kubernetes-master < %{version}-%{release} @@ -95,41 +145,59 @@ %{?systemd_requires} %description node -Manage a cluster of Linux containers as a single system to accelerate Dev and simplify Ops. -Kubernetes services for node host +Kubernetes is a system for automating deployment, scaling, and +management of containerized applications. + +This subpackage contains the Kubernetes services for node hosts. %package client Summary: Kubernetes client tools +Group: System/Management Requires: bash-completion +Requires: kubernetes-common = %{version}-%{release} %description client -Kubernetes client tools like kubectl +Kubernetes client tools like kubectl. %package extra Summary: Kubernetes extra resources +Group: System/Management Requires: go %description extra -Manage a cluster of Linux containers as a single system to accelerate Dev and simplify Ops. -Kubernetes extra resources: cluster providers, demos, testsuite... +Kubernetes is a system for automating deployment, scaling, and +management of containerized applications. + +This subpackage contains Kubernetes extra resources: cluster +providers, demos, testsuite... %prep %setup -q %patch1 -p1 -%patch2 -p1 +#%patch2 -p1 %patch3 -p1 +%patch4 -p1 +%patch6 -p1 +%patch7 -p1 +%{goprep} github.com/kubernetes/kubernetes %build -%{goprep} github.com/kubernetes/kubernetes +export KUBE_GIT_TREE_STATE="clean" export KUBE_GIT_VERSION=v%{version} -./hack/build-go.sh --use_go_build + +# 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 +./hack/generate-docs.sh || true pushd docs pushd admin cp kube-apiserver.md kube-controller-manager.md kube-proxy.md kube-scheduler.md kubelet.md .. @@ -138,73 +206,58 @@ bash genmanpages.sh popd -cd hack && go build e2e.go - %install -%ifarch x86_64 -host_arch=amd64 -output_path="_output/local/bin/linux/amd64" +%ifarch ppc64le +output_path="_output/local/go/bin" %else - %ifarch %arm - host_arch=arm - %else - %ifarch %ix86 - host_arch=386 - %else - %ifarch s390x - host_arch=s390x - %else - %ifarch ppc64 - host_arch=ppc64le - %endif - %endif - %endif - %endif - output_path="_output/local/go/bin" +output_path="_output/local/bin/linux/%{go_arch}" %endif -platform_path="platforms/linux/${host_arch}" +install -m 755 -d %{buildroot}%{_bindir} + +echo "+++ INSTALLING hyperkube" +install -p -m 755 -t %{buildroot}%{_bindir} ${output_path}/hyperkube + +echo "+++ INSTALLING kubeadm" +install -p -m 755 -t %{buildroot}%{_bindir} ${output_path}/kubeadm binaries=(kube-apiserver kube-controller-manager kube-scheduler kube-proxy kubelet kubectl) -install -m 755 -d %{buildroot}%{_bindir} for bin in "${binaries[@]}"; do - echo "+++ INSTALLING ${bin}" - install -p -m 755 -t %{buildroot}%{_bindir} ${output_path}/${bin} + echo "+++ HARDLINKING ${bin} to hyperkube" + ln %{buildroot}%{_bindir}/hyperkube %{buildroot}%{_bindir}/${bin} done -# install extra things -kubernetes_src=%{buildroot}%{_usrsrc}/kubernetes +# 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 +# install extra things (needed for e2e tests) +kubernetes_src=%{buildroot}%{_usrsrc}/kubernetes install -m 755 -d ${kubernetes_src} -cp -R cluster ${kubernetes_src}/ -cp -R examples ${kubernetes_src}/ -cp -R hack ${kubernetes_src}/ -cp -R test ${kubernetes_src}/ - -platforms_dir=${kubernetes_src}/platforms/linux/${host_arch} -extra_binaries=(ginkgo e2e_node.test e2e.test integration) -install -m 755 -d $platforms_dir -for bin in "${extra_binaries[@]}"; do - echo "+++ INSTALLING ${bin}" - install -p -m 755 -t ${platforms_dir} ${output_path}/${bin} +cp -R cluster examples hack test ${kubernetes_src}/ + +# install things needed for running the e2e tests +install -d -m 0755 ${kubernetes_src}/platforms/linux/%{go_arch} +for exe in ginkgo e2e.test ; do + install -p -m 755 -D -t ${kubernetes_src}/platforms/linux/%{go_arch}/ ${output_path}/${exe} done -# # systemd service -# install -d -m 0755 %{buildroot}%{_unitdir} -install -m 0644 -t %{buildroot}%{_unitdir}/ %{SOURCE10} -install -m 0644 -t %{buildroot}%{_unitdir}/ %{SOURCE11} -install -m 0644 -t %{buildroot}%{_unitdir}/ %{SOURCE12} -install -m 0644 -t %{buildroot}%{_unitdir}/ %{SOURCE13} -install -m 0644 -t %{buildroot}%{_unitdir}/ %{SOURCE14} +for src in %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} ; do + install -m 0644 -t %{buildroot}%{_unitdir}/ "$src" +done # make symlinks to rc files -mkdir -p %{buildroot}%{_sbindir} -for rc in kube-proxy kubelet kube-apiserver kube-controller-manager kube-scheduler -do - ln -sf service %{buildroot}%{_sbindir}/rc$rc +install -d -m 0755 %{buildroot}%{_sbindir} +for rc in kube-proxy kubelet kube-apiserver kube-controller-manager kube-scheduler kubeadm ; do + ln -sf service "%{buildroot}%{_sbindir}/rc$rc" done # install manpages @@ -213,12 +266,12 @@ # install config files install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name} -install -m 0644 -t %{buildroot}%{_sysconfdir}/%{name} %{SOURCE20} -install -m 0644 -t %{buildroot}%{_sysconfdir}/%{name} %{SOURCE21} -install -m 0644 -t %{buildroot}%{_sysconfdir}/%{name} %{SOURCE22} -install -m 0644 -t %{buildroot}%{_sysconfdir}/%{name} %{SOURCE23} -install -m 0644 -t %{buildroot}%{_sysconfdir}/%{name} %{SOURCE24} -install -m 0644 -t %{buildroot}%{_sysconfdir}/%{name} %{SOURCE25} +for src in %{SOURCE20} %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24} %{SOURCE25} ; do + install -m 0644 -t %{buildroot}%{_sysconfdir}/%{name} "$src" +done + +# manifests file for the kubelet +install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}/manifests # place kubernetes.tmp.conf to /usr/lib/tmpfiles.d/kubernetes.conf install -d -m 0755 %{buildroot}%{_tmpfilesdir} @@ -229,59 +282,62 @@ %fdupes -s %{buildroot} - %pre master getent group kube >/dev/null || groupadd -r kube getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \ -c "Kubernetes user" kube -%service_add_pre kube-apiserver.service kube-scheduler.service kube-controller-manager.service +%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 -# Generate ServiceAccount key if needed -service_account_key="/var/lib/kubernetes/serviceaccount.key" -if [ ! -f "${service_account_key}" ] ; then - mkdir -p "$(dirname ${service_account_key})" - openssl genrsa -out "${service_account_key}" 2048 2>/dev/null - chmod 600 "${service_account_key}" - chown kube:kube "${service_account_key}" -fi - %post master -%service_add_post kube-apiserver.service kube-scheduler.service kube-controller-manager.service +%service_add_post kube-apiserver.service kube-controller-manager.service kube-scheduler.service %tmpfiles_create %{_tmpfilesdir}/kubernetes.conf %preun master -%service_del_preun kube-apiserver.service kube-scheduler.service kube-controller-manager.service +%service_del_preun kube-apiserver.service kube-controller-manager.service kube-scheduler.service %postun master -%service_del_postun kube-apiserver.service kube-scheduler.service kube-controller-manager.service +%service_del_postun kube-apiserver.service kube-controller-manager.service kube-scheduler.service -%pre node +%pre kubelet getent group kube >/dev/null || groupadd -r kube getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \ -c "Kubernetes user" kube -%service_add_pre kubelet.service kube-proxy.service +%service_add_pre kubelet.service -%post node -%service_add_post kubelet.service kube-proxy.service +%post kubelet +%service_add_post kubelet.service %tmpfiles_create %{_tmpfilesdir}/kubernetes.conf +%preun kubelet +%service_del_preun kubelet.service + +%postun kubelet +%service_del_postun kubelet.service + +%pre node +%service_add_pre kube-proxy.service + +%post node +%service_add_post kube-proxy.service + %preun node -%service_del_preun kubelet.service kube-proxy.service +%service_del_preun kube-proxy.service %postun node -%service_del_postun kubelet.service kube-proxy.service +%service_del_postun kube-proxy.service %files common %defattr(-,root,root) %config(noreplace) %{_sysconfdir}/%{name}/config +%{_bindir}/hyperkube %files master %defattr(-,root,root) -%doc README.md LICENSE CONTRIB.md CONTRIBUTING.md DESIGN.md +%doc README.md LICENSE CONTRIBUTING.md %{_mandir}/man1/kube-apiserver.1* %{_mandir}/man1/kube-controller-manager.1* %{_mandir}/man1/kube-scheduler.1* @@ -298,34 +354,48 @@ %dir %{_sysconfdir}/%{name} %config(noreplace) %{_sysconfdir}/%{name}/apiserver -%config(noreplace) %{_sysconfdir}/%{name}/scheduler %config(noreplace) %{_sysconfdir}/%{name}/controller-manager +%config(noreplace) %{_sysconfdir}/%{name}/scheduler %{_tmpfilesdir}/kubernetes.conf -%files node +%files kubelet %defattr(-,root,root) -%doc README.md LICENSE CONTRIB.md CONTRIBUTING.md DESIGN.md CHANGELOG.md +%doc README.md LICENSE CONTRIBUTING.md CHANGELOG.md %{_mandir}/man1/kubelet.1* -%{_mandir}/man1/kube-proxy.1* %{_bindir}/kubelet -%{_bindir}/kube-proxy -%{_unitdir}/kube-proxy.service %{_unitdir}/kubelet.service -%{_sbindir}/rckube-proxy %{_sbindir}/rckubelet %dir %{_localstatedir}/lib/kubelet %dir %{_sysconfdir}/%{name} +%dir %{_sysconfdir}/%{name}/manifests %config(noreplace) %{_sysconfdir}/%{name}/kubelet -%config(noreplace) %{_sysconfdir}/%{name}/proxy %{_tmpfilesdir}/%{name}.conf %attr(0750,root,root) %dir %ghost %{_rundir}/%{name} +%files kubeadm +%defattr(-,root,root) +%doc README.md LICENSE CONTRIBUTING.md CHANGELOG.md +%{_bindir}/kubeadm +%{_sbindir}/rckubeadm + +%files node +%defattr(-,root,root) +%doc README.md LICENSE CONTRIBUTING.md CHANGELOG.md +%{_mandir}/man1/kube-proxy.1* +%{_bindir}/kube-proxy +%{_unitdir}/kube-proxy.service +%{_sbindir}/rckube-proxy +%dir %{_sysconfdir}/%{name} +%dir %{_sysconfdir}/%{name}/manifests +%config(noreplace) %{_sysconfdir}/%{name}/proxy + %files client %defattr(-,root,root) -%doc README.md LICENSE CONTRIB.md CONTRIBUTING.md DESIGN.md +%doc README.md LICENSE CONTRIBUTING.md %{_mandir}/man1/kubectl.1* %{_mandir}/man1/kubectl-* %{_bindir}/kubectl +%{_datadir}/bash-completion/completions/kubectl %files extra %defattr(-,root,root) ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.RPRoO7/_old 2017-05-20 10:13:40.435792845 +0200 +++ /var/tmp/diff_new_pack.RPRoO7/_new 2017-05-20 10:13:40.439792280 +0200 @@ -3,6 +3,9 @@ <memory> <size unit="G">4</size> </memory> + <physicalmemory> + <size unit="G">4</size> + </physicalmemory> <disk> <size unit="G">6</size> </disk> ++++++ _service ++++++ --- /var/tmp/diff_new_pack.RPRoO7/_old 2017-05-20 10:13:40.463788890 +0200 +++ /var/tmp/diff_new_pack.RPRoO7/_new 2017-05-20 10:13:40.467788324 +0200 @@ -4,8 +4,9 @@ <param name="scm">git</param> <param name="filename">kubernetes</param> <param name="exclude">.git</param> - <param name="versionformat">1.3.10</param> - <param name="revision">v1.3.10</param> + <param name="versionformat">1.6.1</param> + <param name="revision">v1.6.1</param> + <param name="changesgenerate">enable</param> </service> <service name="recompress" mode="disabled"> <param name="file">kubernetes-*.tar</param> ++++++ apiserver ++++++ --- /var/tmp/diff_new_pack.RPRoO7/_old 2017-05-20 10:13:40.491784934 +0200 +++ /var/tmp/diff_new_pack.RPRoO7/_new 2017-05-20 10:13:40.491784934 +0200 @@ -14,13 +14,13 @@ # KUBELET_PORT="--kubelet-port=10250" # Comma separated list of nodes in the etcd cluster -KUBE_ETCD_SERVERS="--etcd-servers=http://127.0.0.1:4001" +KUBE_ETCD_SERVERS="--etcd-servers=http://127.0.0.1:2379" # Address range to use for services KUBE_SERVICE_ADDRESSES="--service-cluster-ip-range=10.254.0.0/16" # default admission control policies -KUBE_ADMISSION_CONTROL="--admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,ResourceQuota" +KUBE_ADMISSION_CONTROL="--admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,ResourceQuota" # Add your own! -KUBE_API_ARGS="--service-account-key-file=/var/lib/kubernetes/serviceaccount.key" +KUBE_API_ARGS="" ++++++ build-with-debug-info.patch ++++++ diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh index c1259a4..9bf8243 100755 --- a/hack/lib/golang.sh +++ b/hack/lib/golang.sh @@ -508,7 +508,7 @@ kube::golang::build_binaries_for_platform() { CGO_ENABLED=0 "${GO}" build -o "${outfile}" \ "${goflags[@]:+${goflags[@]}}" \ -gcflags "${gogcflags}" \ - -ldflags "${goldflags}" \ + -ldflags "-B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') ${goldflags}" \ "${binary}" kube::log::progress "*" done @@ -517,7 +517,7 @@ kube::golang::build_binaries_for_platform() { "${GO}" build -o "${outfile}" \ "${goflags[@]:+${goflags[@]}}" \ -gcflags "${gogcflags}" \ - -ldflags "${goldflags}" \ + -ldflags "-B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') ${goldflags}" \ "${binary}" kube::log::progress "*" done ++++++ config ++++++ --- /var/tmp/diff_new_pack.RPRoO7/_old 2017-05-20 10:13:40.519780978 +0200 +++ /var/tmp/diff_new_pack.RPRoO7/_new 2017-05-20 10:13:40.519780978 +0200 @@ -6,7 +6,6 @@ # # kube-apiserver.service # kube-controller-manager.service -# kube-scheduler.service # kubelet.service # kube-proxy.service # logging to stderr means we get it in the systemd journal @@ -18,5 +17,5 @@ # Should this cluster be allowed to run privileged docker containers KUBE_ALLOW_PRIV="--allow-privileged=false" -# How the controller-manager, scheduler, and proxy find the apiserver +# How the controller-manager, and proxy find the apiserver KUBE_MASTER="--master=http://127.0.0.1:8080" ++++++ fix-support-for-ppc64le.patch ++++++ diff --git a/Makefile b/Makefile index a6b2fbe..41e2d59 100644 --- a/Makefile +++ b/Makefile @@ -39,7 +39,7 @@ MAKEFLAGS += --no-builtin-rules # Constants used throughout. .EXPORT_ALL_VARIABLES: OUT_DIR ?= _output -BIN_DIR := $(OUT_DIR)/bin +BIN_DIR := $(OUT_DIR)/local/go/bin PRJ_SRC_PATH := k8s.io/kubernetes GENERATED_FILE_PREFIX := zz_generated. diff --git a/hack/lib/init.sh b/hack/lib/init.sh index fc9f0d8..8593ebd 100644 --- a/hack/lib/init.sh +++ b/hack/lib/init.sh @@ -46,7 +46,7 @@ source "${KUBE_ROOT}/hack/lib/version.sh" source "${KUBE_ROOT}/hack/lib/golang.sh" source "${KUBE_ROOT}/hack/lib/etcd.sh" -KUBE_OUTPUT_HOSTBIN="/usr/bin" +KUBE_OUTPUT_HOSTBIN="${KUBE_OUTPUT_BINPATH}/go/bin" # list of all available group versions. This should be used when generated code # or when starting an API server that you want to have everything. diff --git a/hack/lib/util.sh b/hack/lib/util.sh index 30d97be..0dfe400 100755 --- a/hack/lib/util.sh +++ b/hack/lib/util.sh @@ -168,7 +168,7 @@ kube::util::find-binary-for-platform() { local -r lookfor="$1" local -r platform="$2" local locations=( - "${KUBE_ROOT}/_output/bin/${lookfor}" + "${KUBE_ROOT}/_output/local/go/bin/${lookfor}" "${KUBE_ROOT}/_output/dockerized/bin/${platform}/${lookfor}" "${KUBE_ROOT}/_output/local/bin/${platform}/${lookfor}" "${KUBE_ROOT}/platforms/${platform}/${lookfor}" ++++++ git-upstream.patch ++++++ diff --git a/hack/lib/util.sh b/hack/lib/util.sh index 6a0386a..30d97be 100755 --- a/hack/lib/util.sh +++ b/hack/lib/util.sh @@ -406,9 +406,7 @@ kube::util::fetch-swagger-spec() { # Returns the name of the upstream remote repository name for the local git # repo, e.g. "upstream" or "origin". kube::util::git_upstream_remote_name() { - git remote -v | grep fetch |\ - grep -E 'github.com[/:]kubernetes/kubernetes|k8s.io/kubernetes' |\ - head -n 1 | awk '{print $1}' + echo origin } # Checks whether godep restore was run in the current GOPATH, i.e. that all referenced repos exist ++++++ kube-apiserver.service ++++++ --- /var/tmp/diff_new_pack.RPRoO7/_old 2017-05-20 10:13:40.599769676 +0200 +++ /var/tmp/diff_new_pack.RPRoO7/_new 2017-05-20 10:13:40.599769676 +0200 @@ -8,7 +8,7 @@ EnvironmentFile=-/etc/kubernetes/config EnvironmentFile=-/etc/kubernetes/apiserver User=kube -ExecStart=/usr/bin/kube-apiserver \ +ExecStart=/usr/bin/hyperkube apiserver \ $KUBE_LOGTOSTDERR \ $KUBE_LOG_LEVEL \ $KUBE_ETCD_SERVERS \ ++++++ kube-controller-manager.service ++++++ --- /var/tmp/diff_new_pack.RPRoO7/_old 2017-05-20 10:13:40.623766286 +0200 +++ /var/tmp/diff_new_pack.RPRoO7/_new 2017-05-20 10:13:40.623766286 +0200 @@ -6,7 +6,7 @@ EnvironmentFile=-/etc/kubernetes/config EnvironmentFile=-/etc/kubernetes/controller-manager User=kube -ExecStart=/usr/bin/kube-controller-manager \ +ExecStart=/usr/bin/hyperkube controller-manager \ $KUBE_LOGTOSTDERR \ $KUBE_LOG_LEVEL \ $KUBE_MASTER \ ++++++ kube-proxy.service ++++++ --- /var/tmp/diff_new_pack.RPRoO7/_old 2017-05-20 10:13:40.651762330 +0200 +++ /var/tmp/diff_new_pack.RPRoO7/_new 2017-05-20 10:13:40.651762330 +0200 @@ -6,7 +6,7 @@ [Service] EnvironmentFile=-/etc/kubernetes/config EnvironmentFile=-/etc/kubernetes/proxy -ExecStart=/usr/bin/kube-proxy \ +ExecStart=/usr/bin/hyperkube proxy \ $KUBE_LOGTOSTDERR \ $KUBE_LOG_LEVEL \ $KUBE_MASTER \ ++++++ kube-scheduler.service ++++++ --- /var/tmp/diff_new_pack.RPRoO7/_old 2017-05-20 10:13:40.671759505 +0200 +++ /var/tmp/diff_new_pack.RPRoO7/_new 2017-05-20 10:13:40.671759505 +0200 @@ -6,7 +6,7 @@ EnvironmentFile=-/etc/kubernetes/config EnvironmentFile=-/etc/kubernetes/scheduler User=kube -ExecStart=/usr/bin/kube-scheduler \ +ExecStart=/usr/bin/hyperkube scheduler \ $KUBE_LOGTOSTDERR \ $KUBE_LOG_LEVEL \ $KUBE_MASTER \ ++++++ kubelet ++++++ --- /var/tmp/diff_new_pack.RPRoO7/_old 2017-05-20 10:13:40.699755550 +0200 +++ /var/tmp/diff_new_pack.RPRoO7/_new 2017-05-20 10:13:40.699755550 +0200 @@ -14,4 +14,4 @@ KUBELET_API_SERVER="--api-servers=http://127.0.0.1:8080" # Add your own! -KUBELET_ARGS="" +KUBELET_ARGS="--pod-manifest-path=/etc/kubernetes/manifests" ++++++ kubelet.service ++++++ --- /var/tmp/diff_new_pack.RPRoO7/_old 2017-05-20 10:13:40.719752724 +0200 +++ /var/tmp/diff_new_pack.RPRoO7/_new 2017-05-20 10:13:40.723752159 +0200 @@ -8,7 +8,8 @@ WorkingDirectory=/var/lib/kubelet EnvironmentFile=-/etc/kubernetes/config EnvironmentFile=-/etc/kubernetes/kubelet -ExecStart=/usr/bin/kubelet \ +EnvironmentFile=-/etc/kubernetes/kubelet-initial +ExecStart=/usr/bin/hyperkube kubelet \ $KUBE_LOGTOSTDERR \ $KUBE_LOG_LEVEL \ $KUBELET_API_SERVER \ @@ -16,6 +17,7 @@ $KUBELET_PORT \ $KUBELET_HOSTNAME \ $KUBE_ALLOW_PRIV \ + $KUBELET_INITIAL_ARGS \ $KUBELET_ARGS Restart=on-failure ++++++ kubernetes-1.3.10.tar.xz -> kubernetes-1.6.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/kubernetes/kubernetes-1.3.10.tar.xz /work/SRC/openSUSE:Factory/.kubernetes.new/kubernetes-1.6.1.tar.xz differ: char 26, line 1 ++++++ make-e2e_node-run-over-distro-bins.patch ++++++ diff --git a/hack/lib/init.sh b/hack/lib/init.sh index a07f6f2..fc9f0d8 100644 --- a/hack/lib/init.sh +++ b/hack/lib/init.sh @@ -46,7 +46,7 @@ source "${KUBE_ROOT}/hack/lib/version.sh" source "${KUBE_ROOT}/hack/lib/golang.sh" source "${KUBE_ROOT}/hack/lib/etcd.sh" -KUBE_OUTPUT_HOSTBIN="${KUBE_OUTPUT_BINPATH}/$(kube::util::host_platform)" +KUBE_OUTPUT_HOSTBIN="/usr/bin" # list of all available group versions. This should be used when generated code # or when starting an API server that you want to have everything. diff --git a/hack/make-rules/test-e2e-node.sh b/hack/make-rules/test-e2e-node.sh index 20cea09..4190c19 100755 --- a/hack/make-rules/test-e2e-node.sh +++ b/hack/make-rules/test-e2e-node.sh @@ -155,6 +155,6 @@ else # Provided for backwards compatibility go run test/e2e_node/runner/local/run_local.go --ginkgo-flags="$ginkgoflags" \ --test-flags="--container-runtime=${runtime} --alsologtostderr --v 4 --report-dir=${artifacts} --node-name $(hostname) \ - $test_args" --build-dependencies=true 2>&1 | tee -i "${artifacts}/build-log.txt" + $test_args --k8s-bin-dir /usr/bin" --build-dependencies=true 2>&1 | tee -i "${artifacts}/build-log.txt" exit $? fi diff --git a/test/e2e_node/builder/build.go b/test/e2e_node/builder/build.go index f22232a..ef60a41 100644 --- a/test/e2e_node/builder/build.go +++ b/test/e2e_node/builder/build.go @@ -31,7 +31,7 @@ import ( var k8sBinDir = flag.String("k8s-bin-dir", "", "Directory containing k8s kubelet binaries.") var buildTargets = []string{ - "cmd/kubelet", + //"cmd/kubelet", "test/e2e_node/e2e_node.test", "vendor/github.com/onsi/ginkgo/ginkgo", } @@ -53,6 +53,10 @@ func BuildGo() error { return nil } +func GetK8sBinDir() string { + return *k8sBinDir +} + func getK8sBin(bin string) (string, error) { // Use commandline specified path if *k8sBinDir != "" { diff --git a/test/e2e_node/services/services.go b/test/e2e_node/services/services.go index c206a85..7019af8 100644 --- a/test/e2e_node/services/services.go +++ b/test/e2e_node/services/services.go @@ -141,6 +141,11 @@ func (e *E2EServices) startInternalServices() (*server, error) { } // Pass all flags into the child process, so that it will see the same flag set. startCmd := exec.Command(testBin, append([]string{"--run-services-mode"}, os.Args[1:]...)...) + + if build.GetK8sBinDir() != "" { + startCmd.Args = append(startCmd.Args, fmt.Sprintf("--k8s-bin-dir=%v", build.GetK8sBinDir())) + } + server := newServer("services", startCmd, nil, nil, getServicesHealthCheckURLs(), servicesLogFile, e.monitorParent, false) return server, server.start() }