From c78c989e8b9cfbe788d3f695dce4cf14536ad29d Mon Sep 17 00:00:00 2001
From: Spyros Trigazis <strigazi@gmail.com>
Date: Jan 12 2018 13:19:14 +0000
Subject: Update to upstream v1.9.1


* Update sources, version and commit
* Add kubeadm manpage
* s/current_platform/host_platform/
  current_platform has been removed
* rm 'rm src/k8s.io/kubernetes/cluster/gce/gci/mounter/mounter'
  file doesn't exist anymore
* Rebase build-with-debug-info.patch and
  use_go_build-is-not-fully-propagated-so-make-it-fixe.patch
* Remove Patch12
  The federation apiserver and controller-manager are removed
  from the kuberbetes repo
* Patch for version comparison [1]

[1] https://github.com/kubernetes/kubernetes/pull/58207

---

diff --git a/.gitignore b/.gitignore
index a03e2d2..3ec7233 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
-/kubernetes-0b9efae.tar.gz
 /contrib-23bbd3e.tar.gz
-/kubernetes-f38e43b.tar.gz
+/kubernetes-925c127.tar.gz
diff --git a/Use-sort-V-to-compare-golang-versions.patch b/Use-sort-V-to-compare-golang-versions.patch
new file mode 100644
index 0000000..c5cfc5c
--- /dev/null
+++ b/Use-sort-V-to-compare-golang-versions.patch
@@ -0,0 +1,27 @@
+From 5a6ff9ffba4f547dc48ba9bb80da409121325d03 Mon Sep 17 00:00:00 2001
+From: Spyros Trigazis <strigazi@gmail.com>
+Date: Fri, 12 Jan 2018 09:56:50 +0000
+Subject: [PATCH] Use sort -V to compare golang versions
+
+Change hack/lib/golang.sh to compare golang
+version properly with "sort -V" and not as strings.
+---
+ hack/lib/golang.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh
+index 3e12b3170a..0e33119e0b 100755
+--- a/hack/lib/golang.sh
++++ b/hack/lib/golang.sh
+@@ -323,7 +323,7 @@ EOF
+   go_version=($(go version))
+   local minimum_go_version
+   minimum_go_version=go1.9.1
+-  if [[ "${go_version[2]}" < "${minimum_go_version}" && "${go_version[2]}" != "devel" ]]; then
++  if [[ "${minimum_go_version}" == $(echo -e "${minimum_go_version} ${go_version[2]}" | sort --version-sort | head -n1) && "${go_version[2]}" != "devel" ]]; then
+     kube::log::usage_from_stdin <<EOF
+ Detected go version: ${go_version[*]}.
+ Kubernetes requires ${minimum_go_version} or greater.
+-- 
+2.15.1
+
diff --git a/build-with-debug-info.patch b/build-with-debug-info.patch
index b4a5c42..dbc92d7 100644
--- a/build-with-debug-info.patch
+++ b/build-with-debug-info.patch
@@ -8,10 +8,10 @@ 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 a2d2635..c1f3662 100755
+index b9649ce6d0..75faeeb6e8 100755
 --- a/hack/lib/golang.sh
 +++ b/hack/lib/golang.sh
-@@ -505,7 +505,7 @@ kube::golang::build_binaries_for_platform() {
+@@ -502,7 +502,7 @@ kube::golang::build_binaries_for_platform() {
        CGO_ENABLED=0 go build -o "${outfile}" \
          "${goflags[@]:+${goflags[@]}}" \
          -gcflags "${gogcflags}" \
@@ -20,7 +20,7 @@ index a2d2635..c1f3662 100755
          "${binary}"
        kube::log::progress "*"
      done
-@@ -514,7 +514,7 @@ kube::golang::build_binaries_for_platform() {
+@@ -511,7 +511,7 @@ kube::golang::build_binaries_for_platform() {
        go build -o "${outfile}" \
          "${goflags[@]:+${goflags[@]}}" \
          -gcflags "${gogcflags}" \
diff --git a/kubernetes.spec b/kubernetes.spec
index 426e1d6..e0ac6c1 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                  f38e43b221d08850172a9a4ea785a86a3ffa3b3a
+%global commit                  3a1c9449a956b6026f075fa3134ff92f7d55f812
 %global shortcommit              %(c=%{commit}; echo ${c:0:7})
 
 %global con_provider            github
@@ -35,7 +35,7 @@
 %global con_commit              23bbd3e7042e136e5cf59033e6dc2eb2914a0f02
 %global con_shortcommit         %(c=%{con_commit}; echo ${c:0:7})
 
-%global kube_version            1.8.1
+%global kube_version            1.9.1
 %global kube_git_version        v%{kube_version}
 
 # Needed otherwise "version_ldflags=$(kube::version_ldflags)" doesn't work
@@ -61,15 +61,13 @@ Patch3:         build-with-debug-info.patch
 #Patch4:         make-test-cmd-run-over-hyperkube-based-kubectl.patch
 #Patch5:         make-e2e_node-run-over-distro-bins.patch
 
-# Drop apiserver command from hyperkube as apiserver has different permisions and capabilities
-# Add kube-prefix for controller-manager, proxy and scheduler
-Patch12:        remove-apiserver-add-kube-prefix-for-hyperkube-remov.patch
-
 # ppc64le
 Patch16:        fix-support-for-ppc64le.patch
 
 Patch20:        use_go_build-is-not-fully-propagated-so-make-it-fixe.patch
 
+Patch21:        Use-sort-V-to-compare-golang-versions.patch
+
 # It obsoletes cadvisor but needs its source code (literally integrated)
 Obsoletes:      cadvisor
 
@@ -854,6 +852,8 @@ Kubernetes client tools like kubectl
 %setup -q -n %{con_repo}-%{con_commit} -T -b 1
 %setup -q -n %{repo}-%{commit}
 
+%patch21 -p1
+
 %if 0%{?with_debug}
 %patch3 -p1
 %endif
@@ -864,9 +864,6 @@ Kubernetes client tools like kubectl
 mkdir contrib
 cp -r ../%{con_repo}-%{con_commit}/init contrib/.
 
-# Drop apiserver from hyperkube
-%patch12 -p1
-
 #src/k8s.io/kubernetes/pkg/util/certificates
 # Patch the code to remove eliptic.P224 support
 for dir in vendor/github.com/google/certificate-transparency/go/x509 pkg/util/certificates; do
@@ -890,7 +887,6 @@ mv $(ls | grep -v "^src$") src/k8s.io/kubernetes/.
 %patch16 -p1
 %endif
 
-rm src/k8s.io/kubernetes/cluster/gce/gci/mounter/mounter
 ###############
 
 %build
@@ -925,7 +921,7 @@ kube::golang::setup_env
 %ifarch ppc64le
 output_path="_output/local/go/bin"
 %else
-output_path="${KUBE_OUTPUT_BINPATH}/$(kube::golang::current_platform)"
+output_path="${KUBE_OUTPUT_BINPATH}/$(kube::golang::host_platform)"
 %endif
 
 install -m 755 -d %{buildroot}%{_bindir}
@@ -1085,7 +1081,8 @@ fi
 %files kubeadm
 %license LICENSE
 %doc *.md
-# TODO: needs man page
+%{_mandir}/man1/kubeadm.1*
+%{_mandir}/man1/kubeadm-*
 %{_bindir}/kubeadm
 %dir %{_sysconfdir}/systemd/system/kubelet.service.d
 %config(noreplace) %{_sysconfdir}/systemd/system/kubelet.service.d/kubeadm.conf
@@ -1147,6 +1144,10 @@ fi
 
 ############################################
 %changelog
+* Fri Jan 12 2018 Spyros Trigazis <strigazi@gmail.com> - 1.9.1-1
+- Update to upstream v1.9.1
+  resolves #1533794
+
 * Tue Oct 24 2017 Jan Chaloupka <jchaloup@redhat.com> - 1.8.1-1
 - Update to upstream v1.8.1
   resolves: #1497135
diff --git a/sources b/sources
index ae69852..f56d9a6 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
-SHA512 (kubernetes-0b9efae.tar.gz) = fd54ae65260e8b62ab203fe41dc1a9ea9982ea1e986ce7c49971769aed0552d1f0baa162946d94207445ab5a5d0a08806663a496dd4fb00da451a86d72519ac5
 SHA512 (contrib-23bbd3e.tar.gz) = a3e86fed90ef7b0970d80659fd175690a39ccd29d13aed87596093e756bb1fb791924e7e19e17421badc25518fcf5cc6a224eb33213d4b5b142a7d9ac6ffef84
-SHA512 (kubernetes-f38e43b.tar.gz) = 71c7cfdba44db427d9900dc0aa24931be8ac953ae387afcdf93ee58b55c6473e3f384bd70bded5ec7c4a8d327ad8d17049754fb1537ca9eeed52dc1b4226c2f3
+SHA512 (kubernetes-3a1c944.tar.gz) = 05f046d3a4ad5844b05b4b579bbdf2448bfac05197c8fb3a47ca19ff91bd5482972e763c32af84f99e66ccbbcb9c9102d4a5968981f9fd183ecc68c718183af7
diff --git a/use_go_build-is-not-fully-propagated-so-make-it-fixe.patch b/use_go_build-is-not-fully-propagated-so-make-it-fixe.patch
index 7824e10..4b6c3dc 100644
--- a/use_go_build-is-not-fully-propagated-so-make-it-fixe.patch
+++ b/use_go_build-is-not-fully-propagated-so-make-it-fixe.patch
@@ -9,10 +9,10 @@ Subject: [PATCH] use_go_build is not fully propagated so make it fixed for
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh
-index 9bf8243..2806cb7 100755
+index 75faeeb6e8..243b8f0030 100755
 --- a/hack/lib/golang.sh
 +++ b/hack/lib/golang.sh
-@@ -501,7 +501,7 @@ kube::golang::build_binaries_for_platform() {
+@@ -495,7 +495,7 @@ kube::golang::build_binaries_for_platform() {
        kube::golang::fallback_if_stdlib_not_installable;
    fi