diff --git a/.gitignore b/.gitignore
index 6791346..c90332d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
SOURCES/contrib-7fbd252.tar.gz
SOURCES/go-bindata-a0ff256.tar.gz
-SOURCES/kubernetes-a9e9cf3.tar.gz
-SOURCES/ose-87d9d8d.tar.gz
+SOURCES/kubernetes-43a9be4.tar.gz
+SOURCES/ose-c55cf2b.tar.gz
diff --git a/.kubernetes.metadata b/.kubernetes.metadata
index 0b68104..c95ef89 100644
--- a/.kubernetes.metadata
+++ b/.kubernetes.metadata
@@ -1,4 +1,4 @@
aeadd20e11fecfec6428039206120bdc91d6ad3c SOURCES/contrib-7fbd252.tar.gz
7d5ccafe85f5c869b7abc6a23e4c193436239468 SOURCES/go-bindata-a0ff256.tar.gz
-40821ce09ece58583663614636a6a60c9e8587d7 SOURCES/kubernetes-a9e9cf3.tar.gz
-14b3675af2541a26459c6040f6f35e2ff6dce28d SOURCES/ose-87d9d8d.tar.gz
+8a5787aafcce589f332e71c1be4c4bce7133125e SOURCES/kubernetes-43a9be4.tar.gz
+b173436cec35e6b947a7546736bce2258954eda0 SOURCES/ose-c55cf2b.tar.gz
diff --git a/SOURCES/hack-test-cmd.sh.patch b/SOURCES/hack-test-cmd.sh.patch
index c1a76e6..365adbc 100644
--- a/SOURCES/hack-test-cmd.sh.patch
+++ b/SOURCES/hack-test-cmd.sh.patch
@@ -1,14 +1,14 @@
-From 254d3d9ca235888e97416ffb916fb3ae6b3fe0f1 Mon Sep 17 00:00:00 2001
+From 916a2fa6cca162faa2e62d121c128901662d2e48 Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup@redhat.com>
-Date: Mon, 12 Dec 2016 17:07:32 +0100
-Subject: [PATCH] hack hack/test-cmd.sh
+Date: Mon, 6 Feb 2017 22:49:21 +0100
+Subject: [PATCH] hack/test-cmd.sh
---
hack/lib/init.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hack/lib/init.sh b/hack/lib/init.sh
-index 4aafe51..e0934fb 100644
+index ae50779..0a601ac 100644
--- a/hack/lib/init.sh
+++ b/hack/lib/init.sh
@@ -42,7 +42,7 @@ source "${KUBE_ROOT}/hack/lib/version.sh"
@@ -18,8 +18,8 @@ index 4aafe51..e0934fb 100644
-KUBE_OUTPUT_HOSTBIN="${KUBE_OUTPUT_BINPATH}/$(kube::util::host_platform)"
+KUBE_OUTPUT_HOSTBIN="/usr/bin"
- # This emulates "readlink -f" which is not available on MacOS X.
- # Test:
+ # 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.
--
2.7.4
diff --git a/SOURCES/reenable-ui.patch b/SOURCES/reenable-ui.patch
deleted file mode 100644
index 4703ceb..0000000
--- a/SOURCES/reenable-ui.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From f35635c61679f69e109bd793b288042470326e44 Mon Sep 17 00:00:00 2001
-From: Jan Chaloupka <jchaloup@redhat.com>
-Date: Mon, 12 Dec 2016 17:45:42 +0100
-Subject: [PATCH] reenable /ui
-
----
- pkg/genericapiserver/genericapiserver.go | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/pkg/genericapiserver/genericapiserver.go b/pkg/genericapiserver/genericapiserver.go
-index d966e78..0b17cdb 100644
---- a/pkg/genericapiserver/genericapiserver.go
-+++ b/pkg/genericapiserver/genericapiserver.go
-@@ -56,6 +56,7 @@ import (
- "k8s.io/kubernetes/pkg/registry/generic/registry"
- ipallocator "k8s.io/kubernetes/pkg/registry/service/ipallocator"
- "k8s.io/kubernetes/pkg/runtime"
-+ "k8s.io/kubernetes/pkg/ui"
- "k8s.io/kubernetes/pkg/util"
- "k8s.io/kubernetes/pkg/util/async"
- "k8s.io/kubernetes/pkg/util/crypto"
-@@ -471,9 +472,9 @@ func (s *GenericAPIServer) init(c *Config) {
- if c.EnableLogsSupport {
- apiserver.InstallLogsSupport(s.MuxHelper, s.HandlerContainer)
- }
-- // if c.EnableUISupport {
-- // ui.InstallSupport(s.MuxHelper, s.enableSwaggerSupport && s.enableSwaggerUI)
-- // }
-+ if c.EnableUISupport {
-+ ui.InstallSupport(s.MuxHelper, s.enableSwaggerSupport && s.enableSwaggerUI)
-+ }
-
- if c.EnableProfiling {
- s.mux.HandleFunc("/debug/pprof/", pprof.Index)
---
-2.7.4
-
diff --git a/SPECS/kubernetes.spec b/SPECS/kubernetes.spec
index 8f2ba4d..80a6569 100644
--- a/SPECS/kubernetes.spec
+++ b/SPECS/kubernetes.spec
@@ -21,7 +21,7 @@
# https://github.com/openshift/ose
%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
%global import_path k8s.io/kubernetes
-%global commit 87d9d8d7bc5aa35041a8ddfe3d4b367381112f89
+%global commit c55cf2b7d8bfeb947f77453415d775d7f71c89c2
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global openshift_ip github.com/openshift/origin
@@ -32,7 +32,7 @@
%global k8s_repo kubernetes
# https://github.com/kubernetes/kubernetes
%global k8s_provider_prefix %{k8s_provider}.%{k8s_provider_tld}/%{k8s_project}/%{k8s_repo}
-%global k8s_commit a9e9cf3b407c1d315686c452bdb918c719c3ea6e
+%global k8s_commit 43a9be421799afb8a9c02d3541212a6e623c9053
%global k8s_shortcommit %(c=%{k8s_commit}; echo ${c:0:7})
%global k8s_src_dir Godeps/_workspace/src/k8s.io/kubernetes/
%global k8s_src_dir_sed Godeps\\/_workspace\\/src\\/k8s\\.io\\/kubernetes\\/
@@ -57,9 +57,9 @@
%global O4N_GIT_MAJOR_VERSION 3
%global O4N_GIT_MINOR_VERSION 4+
-%global O4N_GIT_VERSION v3.4.0.34
-%global K8S_GIT_VERSION v1.4.0-57-g776c994
-%global kube_version 1.4.0
+%global O4N_GIT_VERSION v3.5.0.17
+%global K8S_GIT_VERSION v1.5.2-47-g43a9be4
+%global kube_version 1.5.2
%global kube_git_version v%{kube_version}
#I really need this, otherwise "version_ldflags=$(kube::version_ldflags)"
@@ -69,7 +69,7 @@
Name: kubernetes
Version: %{kube_version}
-Release: 0.1.git%{shortcommit}%{?dist}
+Release: 0.2.git%{shortcommit}%{?dist}
Summary: Container cluster management
License: ASL 2.0
URL: %{import_path}
@@ -87,9 +87,6 @@ Patch2: Change-etcd-server-port.patch
Patch9: hack-test-cmd.sh.patch
-# ui is enable in pure kubernetes
-Patch12: reenable-ui.patch
-
# Drop apiserver command from hyperkube as apiserver has different permisions and capabilities
# Add kube-prefix for controller-manager, proxy and scheduler
Patch13: remove-apiserver-backport-kubectl-add-kube-prefix-fo.patch
@@ -178,7 +175,7 @@ Kubernetes client tools like kubectl
%endif
# Hack test-cmd.sh to be run with os binaries
-%patch9 -p1
+#%patch9 -p1
%setup -q -n %{bindata_repo}-%{bindata_commit} -T -b 4
@@ -203,11 +200,11 @@ cp -r ../%{k8s_repo}-%{k8s_commit}/cmd/kubectl cmd/.
# copy hack directory
cp -r ../%{k8s_repo}-%{k8s_commit}/hack .
cp -r ../%{k8s_repo}-%{k8s_commit}/cluster .
-# copy contrib directory
-cp -r ../%{k8s_repo}-%{k8s_commit}/contrib .
# copy contrib folder
+mkdir -p contrib
cp -r ../%{con_repo}-%{con_commit}/init contrib/.
# copy docs
+mkdir docs
cp -r ../%{k8s_repo}-%{k8s_commit}/docs/admin docs/.
cp -r ../%{k8s_repo}-%{k8s_commit}/docs/man docs/.
# copy LICENSE and *.md
@@ -216,14 +213,23 @@ cp ../%{k8s_repo}-%{k8s_commit}/*.md .
# copy hyperkube
cp -r ../%{k8s_repo}-%{k8s_commit}/cmd/hyperkube cmd/.
# copy swagger
-cp -r ../%{k8s_repo}-%{k8s_commit}/pkg/ui/data/swagger pkg/ui/data/.
+#cp -r ../%{k8s_repo}-%{k8s_commit}/pkg/ui/data/swagger pkg/ui/data/.
# copy Makefiles
cp -r ../%{k8s_repo}-%{k8s_commit}/Makefile .
cp -r ../%{k8s_repo}-%{k8s_commit}/Makefile.generated_files .
cp -r ../%{k8s_repo}-%{k8s_commit}/test .
+# cmd/libs/go2idl/deepcopy-gen/
+cp -r ../%{k8s_repo}-%{k8s_commit}/cmd/libs/go2idl/{deepcopy-gen,conversion-gen,defaulter-gen,openapi-gen} cmd/libs/go2idl/.
+# missing vendored deps
+# - k8s.io/kubernetes/pkg/client/metrics/prometheus
+# - k8s.io/kubernetes/pkg/version/prometheus
+# - k8s.io/kubernetes/pkg/version/verflag
+mkdir -p vendor/k8s.io/kubernetes/pkg/client/metrics/
+cp -r ../%{k8s_repo}-%{k8s_commit}/pkg/client/metrics/prometheus vendor/k8s.io/kubernetes/pkg/client/metrics/.
+mkdir -p vendor/k8s.io/kubernetes/pkg/version
+cp -r ../%{k8s_repo}-%{k8s_commit}/pkg/version/prometheus vendor/k8s.io/kubernetes/pkg/version/.
+cp -r ../%{k8s_repo}-%{k8s_commit}/pkg/version/verflag vendor/k8s.io/kubernetes/pkg/version/.
-# reenable /ui
-%patch12 -p1
%patch2 -p1
# Drop apiserver from hyperkube
@@ -337,6 +343,10 @@ cp -a src %{buildroot}%{_sharedstatedir}/kubernetes-unit-test/
rm -rf %{buildroot}%{_sharedstatedir}/kubernetes-unit-test/src/k8s.io/kubernetes/_output
cp -a *.md %{buildroot}%{_sharedstatedir}/kubernetes-unit-test/src/k8s.io/kubernetes/
+# rpmdiff issues
+chmod 0644 %{buildroot}%{_sharedstatedir}/kubernetes-unit-test/src/k8s.io/kubernetes/vendor/github.com/openshift/source-to-image/pkg/scripts/install.go
+chmod 0755 %{buildroot}%{_sharedstatedir}/kubernetes-unit-test/src/k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates/predicates_test.go
+
%check
# Fedora, RHEL7 and CentOS are tested via unit-test subpackage
if [ 1 != 1 ]; then
@@ -446,6 +456,14 @@ fi
%systemd_postun
%changelog
+* Mon Feb 06 2017 Jan Chaloupka <jchaloup@redhat.com> - 1.5.2-0.2.gitc55cf2b
+- Fix rpmdiff issues
+ related: #1419726
+
+* Mon Feb 06 2017 Jan Chaloupka <jchaloup@redhat.com> - 1.5.2-0.1.gitc55cf2b
+- Update to ose v3.5.0.17
+ resolves: #1419726
+
* Mon Dec 12 2016 Jan Chaloupka <jchaloup@redhat.com> - 1.4.0-0.1.git87d9d8d
- Update to ose v3.4.0.34
resolves: #1403892