diff --git a/.gitignore b/.gitignore index 4a3b5f8..437324b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/kubernetes-095136c.tar.gz /contrib-0f5b210.tar.gz +/kubernetes-1dc5c66.tar.gz diff --git a/build-with-debug-info.patch b/build-with-debug-info.patch index 722af96..b4a5c42 100644 --- a/build-with-debug-info.patch +++ b/build-with-debug-info.patch @@ -1,6 +1,6 @@ -From 49d9b8b5dd57db18c946f41715cff368c54339a9 Mon Sep 17 00:00:00 2001 +From c6b33500dd265875165a425da228106ea9fae7ed Mon Sep 17 00:00:00 2001 From: Jan Chaloupka -Date: Tue, 11 Apr 2017 13:17:32 +0200 +Date: Mon, 17 Jul 2017 08:47:32 +0200 Subject: [PATCH] build with debug info --- @@ -8,11 +8,11 @@ Subject: [PATCH] build with debug info 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh -index c1259a4..9bf8243 100755 +index a2d2635..c1f3662 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}" \ +@@ -505,7 +505,7 @@ kube::golang::build_binaries_for_platform() { + CGO_ENABLED=0 go build -o "${outfile}" \ "${goflags[@]:+${goflags[@]}}" \ -gcflags "${gogcflags}" \ - -ldflags "${goldflags}" \ @@ -20,8 +20,8 @@ index c1259a4..9bf8243 100755 "${binary}" kube::log::progress "*" done -@@ -517,7 +517,7 @@ kube::golang::build_binaries_for_platform() { - "${GO}" build -o "${outfile}" \ +@@ -514,7 +514,7 @@ kube::golang::build_binaries_for_platform() { + go build -o "${outfile}" \ "${goflags[@]:+${goflags[@]}}" \ -gcflags "${gogcflags}" \ - -ldflags "${goldflags}" \ @@ -30,5 +30,5 @@ index c1259a4..9bf8243 100755 kube::log::progress "*" done -- -2.7.4 +2.7.5 diff --git a/fix-support-for-ppc64le.patch b/fix-support-for-ppc64le.patch index ebe88bd..ae3df13 100644 --- a/fix-support-for-ppc64le.patch +++ b/fix-support-for-ppc64le.patch @@ -1,18 +1,18 @@ -From 4cb08c846e43440ce3c7acce14fc328b59f5650b Mon Sep 17 00:00:00 2001 +From 8585e6e6245a7e42e1ef767ea34d0bb08ca56e47 Mon Sep 17 00:00:00 2001 From: Jan Chaloupka -Date: Thu, 13 Apr 2017 14:04:43 +0200 +Date: Mon, 17 Jul 2017 14:22:29 +0200 Subject: [PATCH] fix support for ppc64le --- - src/k8s.io/kubernetes/Makefile | 2 +- - src/k8s.io/kubernetes/hack/lib/init.sh | 2 +- - src/k8s.io/kubernetes/hack/lib/util.sh | 2 +- + src/k8s.io/kubernetes/build/root/Makefile | 2 +- + src/k8s.io/kubernetes/hack/lib/init.sh | 2 +- + src/k8s.io/kubernetes/hack/lib/util.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -diff --git a/src/k8s.io/kubernetes/Makefile b/src/k8s.io/kubernetes/Makefile -index a6b2fbe..41e2d59 100644 ---- a/src/k8s.io/kubernetes/Makefile -+++ b/src/k8s.io/kubernetes/Makefile +diff --git a/src/k8s.io/kubernetes/build/root/Makefile b/src/k8s.io/kubernetes/build/root/Makefile +index ea5eec8..5a88385 100644 +--- a/src/k8s.io/kubernetes/build/root/Makefile ++++ b/src/k8s.io/kubernetes/build/root/Makefile @@ -39,7 +39,7 @@ MAKEFLAGS += --no-builtin-rules # Constants used throughout. .EXPORT_ALL_VARIABLES: @@ -23,10 +23,10 @@ index a6b2fbe..41e2d59 100644 GENERATED_FILE_PREFIX := zz_generated. diff --git a/src/k8s.io/kubernetes/hack/lib/init.sh b/src/k8s.io/kubernetes/hack/lib/init.sh -index a07f6f2..b21f907 100644 +index 02aba9e..a53f326 100755 --- a/src/k8s.io/kubernetes/hack/lib/init.sh +++ b/src/k8s.io/kubernetes/hack/lib/init.sh -@@ -46,7 +46,7 @@ source "${KUBE_ROOT}/hack/lib/version.sh" +@@ -45,7 +45,7 @@ source "${KUBE_ROOT}/hack/lib/version.sh" source "${KUBE_ROOT}/hack/lib/golang.sh" source "${KUBE_ROOT}/hack/lib/etcd.sh" @@ -36,7 +36,7 @@ index a07f6f2..b21f907 100644 # 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/src/k8s.io/kubernetes/hack/lib/util.sh b/src/k8s.io/kubernetes/hack/lib/util.sh -index 6a0386a..e8d126d 100755 +index 50f6b55..c8a8b5e 100755 --- a/src/k8s.io/kubernetes/hack/lib/util.sh +++ b/src/k8s.io/kubernetes/hack/lib/util.sh @@ -168,7 +168,7 @@ kube::util::find-binary-for-platform() { @@ -49,5 +49,5 @@ index 6a0386a..e8d126d 100755 "${KUBE_ROOT}/_output/local/bin/${platform}/${lookfor}" "${KUBE_ROOT}/platforms/${platform}/${lookfor}" -- -2.7.4 +2.7.5 diff --git a/kubernetes.spec b/kubernetes.spec index 312b1af..8934d8d 100644 --- a/kubernetes.spec +++ b/kubernetes.spec @@ -23,7 +23,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path k8s.io/kubernetes -%global commit 095136c3078ccf887b9034b7ce598a0a1faff769 +%global commit 1dc5c66f5dd61da08412a74221ecc79208c2165b %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global con_provider github @@ -35,7 +35,7 @@ %global con_commit 0f5b210313371ff769da24d8264f5a7869c5a3f3 %global con_shortcommit %(c=%{con_commit}; echo ${c:0:7}) -%global kube_version 1.6.7 +%global kube_version 1.7.1 %global kube_git_version v%{kube_version} # Needed otherwise "version_ldflags=$(kube::version_ldflags)" doesn't work @@ -68,9 +68,6 @@ Patch12: remove-apiserver-add-kube-prefix-for-hyperkube-remov.patch # ppc64le Patch16: fix-support-for-ppc64le.patch -# resolves: bz1413997 -Patch19: fix-rootScopeNaming-generate-selfLink-issue-37686.patch - Patch20: use_go_build-is-not-fully-propagated-so-make-it-fixe.patch # It obsoletes cadvisor but needs its source code (literally integrated) @@ -893,8 +890,6 @@ mv $(ls | grep -v "^src$") src/k8s.io/kubernetes/. %patch16 -p1 %endif -%patch19 -p1 - rm src/k8s.io/kubernetes/cluster/gce/gci/mounter/mounter ############### @@ -1151,6 +1146,10 @@ fi ############################################ %changelog +* Fri Jul 14 2017 Jan Chaloupka - 1.7.1-1 +- Update to upstream v1.7.1 + resolves: #1471767 + * Sat Jul 08 2017 Jan Chaloupka - 1.6.7-1 - Update to upstream v1.6.7 resolves: #1468823 diff --git a/remove-apiserver-add-kube-prefix-for-hyperkube-remov.patch b/remove-apiserver-add-kube-prefix-for-hyperkube-remov.patch index ef12c86..e5a140d 100644 --- a/remove-apiserver-add-kube-prefix-for-hyperkube-remov.patch +++ b/remove-apiserver-add-kube-prefix-for-hyperkube-remov.patch @@ -1,6 +1,6 @@ -From ca225ec53548708ababfacad9d8dc891e498b5ad Mon Sep 17 00:00:00 2001 +From fb27b92a0293384acc00f61beed4055c6346f6a0 Mon Sep 17 00:00:00 2001 From: Jan Chaloupka -Date: Tue, 11 Apr 2017 13:43:38 +0200 +Date: Mon, 17 Jul 2017 08:54:54 +0200 Subject: [PATCH] remove apiserver, add kube-prefix for hyperkube, remove federation cmds @@ -118,18 +118,18 @@ index 35061e9..e6ba736 100644 SimpleUsage: "controller-manager", Long: "A server that runs a set of active components. This includes replication controllers, service endpoints and nodes.", diff --git a/cmd/hyperkube/kube-proxy.go b/cmd/hyperkube/kube-proxy.go -index 46083e4..3c88c64 100644 +index 76bc2dc..a3fa3fe 100644 --- a/cmd/hyperkube/kube-proxy.go +++ b/cmd/hyperkube/kube-proxy.go -@@ -32,7 +32,7 @@ func NewKubeProxy() *Server { - config := options.NewProxyConfig() +@@ -31,7 +31,7 @@ func NewKubeProxy() *Server { + command := app.NewProxyCommand() hks := Server{ - name: "proxy", + name: "kube-proxy", AlternativeName: "kube-proxy", SimpleUsage: "proxy", - Long: `The Kubernetes proxy server is responsible for taking traffic directed at + Long: command.Long, diff --git a/cmd/hyperkube/kube-scheduler.go b/cmd/hyperkube/kube-scheduler.go index fd00103..33a918d 100644 --- a/cmd/hyperkube/kube-scheduler.go @@ -165,5 +165,5 @@ index e1e07b7..f44ae68 100644 hk.RunToExit(os.Args) } -- -2.7.4 +2.7.5 diff --git a/sources b/sources index d61512a..6216ba4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (kubernetes-095136c.tar.gz) = 79be6a1229fc70b966c6830566a3d467abe57732accab934a6aed79129ce20813c97751d95a597d4c549aee4b7582a8d9a0aa2d0d1ed6c997a334e67abfcd750 SHA512 (contrib-0f5b210.tar.gz) = 4cf04c2214d52814d59ad9c276be91261785e4b6a911871637db5e068e6fd0a5de9d1eaee7db112159ce5860f0f339e1396106fcd00a97a16c912772d325ba8f +SHA512 (kubernetes-1dc5c66.tar.gz) = 3e3aae47d3a9289aa8e4fd3d317e45faebf9072e63d5a4d2f11a0eb23d6a85690e0a83c59b98386b54798870560713500cadf6d4918ab32804a0d3b9d3e2d624