diff --git a/.gitignore b/.gitignore
index 48b285e..04043c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
SOURCES/contrib-7fbd252.tar.gz
-SOURCES/kubernetes-114a51d.tar.gz
-SOURCES/ose-ec7364b.tar.gz
+SOURCES/kubernetes-52492b4.tar.gz
+SOURCES/ose-c5ee292.tar.gz
diff --git a/.kubernetes.metadata b/.kubernetes.metadata
index 57ebf36..c6350fa 100644
--- a/.kubernetes.metadata
+++ b/.kubernetes.metadata
@@ -1,3 +1,3 @@
aeadd20e11fecfec6428039206120bdc91d6ad3c SOURCES/contrib-7fbd252.tar.gz
-d9fc239ea31e622f4226d461bf5e5942001b34d6 SOURCES/kubernetes-114a51d.tar.gz
-1ba4820ad0063672a0037f6e176df9565e3812a0 SOURCES/ose-ec7364b.tar.gz
+a5da27c179948483d8f8ac60a16a1ece8bd7f72c SOURCES/kubernetes-52492b4.tar.gz
+d79a66f2c100a215656c807628b00f3d3ebe1ec0 SOURCES/ose-c5ee292.tar.gz
diff --git a/SOURCES/Hyperkube-remove-federation-cmds.patch b/SOURCES/Hyperkube-remove-federation-cmds.patch
new file mode 100644
index 0000000..44d2a4b
--- /dev/null
+++ b/SOURCES/Hyperkube-remove-federation-cmds.patch
@@ -0,0 +1,118 @@
+From d110c7554c0cbb54e08007d75469380e4cfc7891 Mon Sep 17 00:00:00 2001
+From: Jan Chaloupka <jchaloup@redhat.com>
+Date: Wed, 7 Sep 2016 14:19:03 +0200
+Subject: [PATCH] Hyperkube: remove federation cmds
+
+---
+ cmd/hyperkube/federation-apiserver.go | 38 --------------------------
+ cmd/hyperkube/federation-controller-manager.go | 38 --------------------------
+ cmd/hyperkube/main.go | 4 ---
+ 3 files changed, 80 deletions(-)
+ delete mode 100644 cmd/hyperkube/federation-apiserver.go
+ delete mode 100644 cmd/hyperkube/federation-controller-manager.go
+
+diff --git a/cmd/hyperkube/federation-apiserver.go b/cmd/hyperkube/federation-apiserver.go
+deleted file mode 100644
+index 6093dc5..0000000
+--- a/cmd/hyperkube/federation-apiserver.go
++++ /dev/null
+@@ -1,38 +0,0 @@
+-/*
+-Copyright 2016 The Kubernetes Authors All rights reserved.
+-
+-Licensed under the Apache License, Version 2.0 (the "License");
+-you may not use this file except in compliance with the License.
+-You may obtain a copy of the License at
+-
+- http://www.apache.org/licenses/LICENSE-2.0
+-
+-Unless required by applicable law or agreed to in writing, software
+-distributed under the License is distributed on an "AS IS" BASIS,
+-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-See the License for the specific language governing permissions and
+-limitations under the License.
+-*/
+-
+-package main
+-
+-import (
+- "k8s.io/kubernetes/federation/cmd/federation-apiserver/app"
+- genericoptions "k8s.io/kubernetes/pkg/genericapiserver/options"
+-)
+-
+-// NewFederationAPIServer creates a new hyperkube Server object that includes the
+-// description and flags.
+-func NewFederationAPIServer() *Server {
+- s := genericoptions.NewServerRunOptions()
+-
+- hks := Server{
+- SimpleUsage: "federation-apiserver",
+- Long: "The API entrypoint for the federation control plane",
+- Run: func(_ *Server, args []string) error {
+- return app.Run(s)
+- },
+- }
+- s.AddFlags(hks.Flags())
+- return &hks
+-}
+diff --git a/cmd/hyperkube/federation-controller-manager.go b/cmd/hyperkube/federation-controller-manager.go
+deleted file mode 100644
+index d7a2af1..0000000
+--- a/cmd/hyperkube/federation-controller-manager.go
++++ /dev/null
+@@ -1,38 +0,0 @@
+-/*
+-Copyright 2016 The Kubernetes Authors All rights reserved.
+-
+-Licensed under the Apache License, Version 2.0 (the "License");
+-you may not use this file except in compliance with the License.
+-You may obtain a copy of the License at
+-
+- http://www.apache.org/licenses/LICENSE-2.0
+-
+-Unless required by applicable law or agreed to in writing, software
+-distributed under the License is distributed on an "AS IS" BASIS,
+-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-See the License for the specific language governing permissions and
+-limitations under the License.
+-*/
+-
+-package main
+-
+-import (
+- "k8s.io/kubernetes/federation/cmd/federation-controller-manager/app"
+- "k8s.io/kubernetes/federation/cmd/federation-controller-manager/app/options"
+-)
+-
+-// NewFederationCMServer creates a new hyperkube Server object that includes the
+-// description and flags.
+-func NewFederationCMServer() *Server {
+- s := options.NewCMServer()
+-
+- hks := Server{
+- SimpleUsage: "federation-controller-manager",
+- Long: "Controller manager for federation control plane. Manages federation service endpoints and controllers",
+- Run: func(_ *Server, args []string) error {
+- return app.Run(s)
+- },
+- }
+- s.AddFlags(hks.Flags())
+- return &hks
+-}
+diff --git a/cmd/hyperkube/main.go b/cmd/hyperkube/main.go
+index 460d011..4d9c499 100644
+--- a/cmd/hyperkube/main.go
++++ b/cmd/hyperkube/main.go
+@@ -38,9 +38,5 @@ func main() {
+ hk.AddServer(NewKubelet())
+ hk.AddServer(NewKubeProxy())
+
+- //Federation servers
+- hk.AddServer(NewFederationAPIServer())
+- hk.AddServer(NewFederationCMServer())
+-
+ hk.RunToExit(os.Args)
+ }
+--
+1.9.3
+
diff --git a/SOURCES/disable-v1beta3.patch b/SOURCES/disable-v1beta3.patch
deleted file mode 100644
index 8158d85..0000000
--- a/SOURCES/disable-v1beta3.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 45ec297eb47cca180efc3a8d872d5022097a32fe Mon Sep 17 00:00:00 2001
-From: Jan Chaloupka <jchaloup@redhat.com>
-Date: Fri, 15 Apr 2016 16:18:07 +0200
-Subject: [PATCH] disable v1beta3
-
----
- pkg/api/install/install.go | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pkg/api/install/install.go b/pkg/api/install/install.go
-index fc4dcac..7cbacd9 100644
---- a/pkg/api/install/install.go
-+++ b/pkg/api/install/install.go
-@@ -39,7 +39,7 @@ const importPrefix = "k8s.io/kubernetes/pkg/api"
- var accessor = meta.NewAccessor()
-
- // availableVersions lists all known external versions for this group from most preferred to least preferred
--var availableVersions = []unversioned.GroupVersion{v1.SchemeGroupVersion, v1beta3.SchemeGroupVersion}
-+var availableVersions = []unversioned.GroupVersion{v1.SchemeGroupVersion}
-
- func init() {
- registered.RegisterVersions(availableVersions)
---
-1.9.3
-
diff --git a/SOURCES/hack-test-cmd.sh.patch b/SOURCES/hack-test-cmd.sh.patch
index edca2cb..f2dcf0c 100644
--- a/SOURCES/hack-test-cmd.sh.patch
+++ b/SOURCES/hack-test-cmd.sh.patch
@@ -1,6 +1,6 @@
-From ce126401cb7ba22e74faa1e97298f2faa26f804c Mon Sep 17 00:00:00 2001
+From e682bfc7b77b6d22719472885a4334846a95f501 Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup@redhat.com>
-Date: Fri, 15 Apr 2016 14:48:26 +0200
+Date: Wed, 7 Sep 2016 13:50:54 +0200
Subject: [PATCH] hack hack/test-cmd.sh
---
@@ -8,18 +8,18 @@ Subject: [PATCH] hack hack/test-cmd.sh
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hack/lib/init.sh b/hack/lib/init.sh
-index 9fa47ca..1a18946 100644
+index 3464a96..c6446ac 100644
--- a/hack/lib/init.sh
+++ b/hack/lib/init.sh
-@@ -40,7 +40,7 @@ source "${KUBE_ROOT}/hack/lib/version.sh"
- source "${KUBE_ROOT}/hack/lib/golang.sh"
- source "${KUBE_ROOT}/hack/lib/etcd.sh"
+@@ -41,7 +41,7 @@ source "${KUBE_ROOT}/hack/lib/etcd.sh"
+
+ KUBE_GIT_UPSTREAM="${KUBE_GIT_UPSTREAM:-upstream}"
-KUBE_OUTPUT_HOSTBIN="${KUBE_OUTPUT_BINPATH}/$(kube::util::host_platform)"
+KUBE_OUTPUT_HOSTBIN="/usr/bin"
- # emulates "readlink -f" which is not available on BSD (OS X).
- function readlinkdashf {
+ # This emulates "readlink -f" which is not available on MacOS X.
+ # Test:
--
1.9.3
diff --git a/SOURCES/hyperkube-kubectl-dont-shift-os.Args.patch b/SOURCES/hyperkube-kubectl-dont-shift-os.Args.patch
deleted file mode 100644
index 02abeba..0000000
--- a/SOURCES/hyperkube-kubectl-dont-shift-os.Args.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 0b94fc23c1c9ea2ad14fcbc9e436510d1992b2ca Mon Sep 17 00:00:00 2001
-From: Jan Chaloupka <jchaloup@redhat.com>
-Date: Mon, 29 Feb 2016 16:07:27 +0100
-Subject: [PATCH] hyperkube-kubectl-dont shift os.Args
-
----
- cmd/hyperkube/kubectl.go | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/cmd/hyperkube/kubectl.go b/cmd/hyperkube/kubectl.go
-index 9da15cf..954422d 100644
---- a/cmd/hyperkube/kubectl.go
-+++ b/cmd/hyperkube/kubectl.go
-@@ -28,7 +28,6 @@ func NewKubectlServer() *Server {
- SimpleUsage: "Kubernetes command line client",
- Long: "Kubernetes command line client",
- Run: func(s *Server, args []string) error {
-- os.Args = os.Args[1:]
- if err := app.Run(); err != nil {
- os.Exit(1)
- }
---
-1.9.3
-
diff --git a/SOURCES/hyperkube.server-don-t-parse-args-for-any-command.patch b/SOURCES/hyperkube.server-don-t-parse-args-for-any-command.patch
deleted file mode 100644
index b26b4c0..0000000
--- a/SOURCES/hyperkube.server-don-t-parse-args-for-any-command.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From 2c4222f97ad37f60ee300f7e40b1965e2638017c Mon Sep 17 00:00:00 2001
-From: Jan Chaloupka <jchaloup@redhat.com>
-Date: Fri, 15 Apr 2016 16:44:09 +0200
-Subject: [PATCH] hyperkube.server: don't parse args for any command
-
----
- cmd/hyperkube/hyperkube.go | 16 +++++++++-------
- cmd/hyperkube/kube-controller-manager.go | 1 +
- cmd/hyperkube/kube-scheduler.go | 1 +
- cmd/hyperkube/kubectl.go | 1 +
- cmd/hyperkube/kubelet.go | 1 +
- cmd/hyperkube/server.go | 1 +
- 6 files changed, 14 insertions(+), 7 deletions(-)
-
-diff --git a/cmd/hyperkube/hyperkube.go b/cmd/hyperkube/hyperkube.go
-index 5272c5d..fda068a 100644
---- a/cmd/hyperkube/hyperkube.go
-+++ b/cmd/hyperkube/hyperkube.go
-@@ -154,14 +154,16 @@ func (hk *HyperKube) Run(args []string) error {
- return err
- }
-
-- s.Flags().AddFlagSet(hk.Flags())
-- err = s.Flags().Parse(args)
-- if err != nil || hk.helpFlagVal {
-- if err != nil {
-- hk.Printf("Error: %v\n\n", err)
-+ if !s.NoParse {
-+ s.Flags().AddFlagSet(hk.Flags())
-+ err = s.Flags().Parse(args)
-+ if err != nil || hk.helpFlagVal {
-+ if err != nil {
-+ hk.Printf("Error: %v\n\n", err)
-+ }
-+ s.Usage()
-+ return err
- }
-- s.Usage()
-- return err
- }
-
- verflag.PrintAndExitIfRequested()
-diff --git a/cmd/hyperkube/kube-controller-manager.go b/cmd/hyperkube/kube-controller-manager.go
-index 1fc5107..5b3c4a8 100644
---- a/cmd/hyperkube/kube-controller-manager.go
-+++ b/cmd/hyperkube/kube-controller-manager.go
-@@ -34,6 +34,7 @@ func NewKubeControllerManager() *Server {
- Run: func(_ *Server, args []string) error {
- return app.Run(s)
- },
-+ NoParse: false,
- }
- s.AddFlags(hks.Flags())
- return &hks
-diff --git a/cmd/hyperkube/kube-scheduler.go b/cmd/hyperkube/kube-scheduler.go
-index 4be08e1..5efdf42 100644
---- a/cmd/hyperkube/kube-scheduler.go
-+++ b/cmd/hyperkube/kube-scheduler.go
-@@ -34,6 +34,7 @@ func NewScheduler() *Server {
- Run: func(_ *Server, _ []string) error {
- return app.Run(s)
- },
-+ NoParse: false,
- }
- s.AddFlags(hks.Flags())
- return &hks
-diff --git a/cmd/hyperkube/kubectl.go b/cmd/hyperkube/kubectl.go
-index 954422d..922853b 100644
---- a/cmd/hyperkube/kubectl.go
-+++ b/cmd/hyperkube/kubectl.go
-@@ -34,5 +34,6 @@ func NewKubectlServer() *Server {
- os.Exit(0)
- return nil
- },
-+ NoParse: true,
- }
- }
-diff --git a/cmd/hyperkube/kubelet.go b/cmd/hyperkube/kubelet.go
-index 0c2f616..a0a1037 100644
---- a/cmd/hyperkube/kubelet.go
-+++ b/cmd/hyperkube/kubelet.go
-@@ -36,6 +36,7 @@ func NewKubelet() *Server {
- Run: func(_ *Server, _ []string) error {
- return app.Run(s, nil)
- },
-+ NoParse: false,
- }
- s.AddFlags(hks.Flags())
- return &hks
-diff --git a/cmd/hyperkube/server.go b/cmd/hyperkube/server.go
-index 6b6e5ce..0baa814 100644
---- a/cmd/hyperkube/server.go
-+++ b/cmd/hyperkube/server.go
-@@ -34,6 +34,7 @@ type Server struct {
- SimpleUsage string // One line description of the server.
- Long string // Longer free form description of the server
- Run serverRunFunc // Run the server. This is not expected to return.
-+ NoParse bool // Don't parse options. Some commands do it on their own.
-
- flags *pflag.FlagSet // Flags for the command (and all dependents)
- name string
---
-1.9.3
-
diff --git a/SOURCES/reenable-ui.patch b/SOURCES/reenable-ui.patch
index 1ceac22..8067333 100644
--- a/SOURCES/reenable-ui.patch
+++ b/SOURCES/reenable-ui.patch
@@ -1,6 +1,6 @@
-From c8106ef81c9ff31bd7d3bf25634d2d6c74a6765d Mon Sep 17 00:00:00 2001
+From 6900ee592a90a51b45ccb68083f932300584490e Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup@redhat.com>
-Date: Fri, 15 Apr 2016 14:58:39 +0200
+Date: Wed, 7 Sep 2016 13:47:35 +0200
Subject: [PATCH] reenable /ui
---
@@ -8,26 +8,26 @@ Subject: [PATCH] reenable /ui
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/pkg/genericapiserver/genericapiserver.go b/pkg/genericapiserver/genericapiserver.go
-index 6db1406..2a24fac 100644
+index fd27de1..ec6f3f4 100644
--- a/pkg/genericapiserver/genericapiserver.go
+++ b/pkg/genericapiserver/genericapiserver.go
-@@ -43,6 +43,7 @@ import (
+@@ -45,6 +45,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/storage"
+ "k8s.io/kubernetes/pkg/ui"
"k8s.io/kubernetes/pkg/util"
+ "k8s.io/kubernetes/pkg/util/crypto"
utilnet "k8s.io/kubernetes/pkg/util/net"
- utilruntime "k8s.io/kubernetes/pkg/util/runtime"
-@@ -549,9 +550,9 @@ func (s *GenericAPIServer) init(c *Config) {
+@@ -444,9 +445,9 @@ func (s *GenericAPIServer) init(c *Config) {
if c.EnableLogsSupport {
apiserver.InstallLogsSupport(s.MuxHelper)
}
- // if c.EnableUISupport {
-- // ui.InstallSupport(s.MuxHelper, s.enableSwaggerSupport)
+- // ui.InstallSupport(s.MuxHelper, s.enableSwaggerSupport && s.enableSwaggerUI)
- // }
+ if c.EnableUISupport {
-+ ui.InstallSupport(s.MuxHelper, s.enableSwaggerSupport)
++ ui.InstallSupport(s.MuxHelper, s.enableSwaggerSupport && s.enableSwaggerUI)
+ }
if c.EnableProfiling {
diff --git a/SPECS/kubernetes.spec b/SPECS/kubernetes.spec
index 3887e82..a1041e2 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 ec7364b6e3b155e78086018aa644057edbe196e5
+%global commit c5ee292ce8f0df382b52096902778274c7eab945
%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 114a51dfbc43a8bcf07db1774a20e05d560e34b0
+%global k8s_commit 52492b4bff99ef3b8ca617d385a3ff0612f9402d
%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\\/
@@ -47,10 +47,10 @@
%global con_shortcommit %(c=%{con_commit}; echo ${c:0:7})
%global O4N_GIT_MAJOR_VERSION 3
-%global O4N_GIT_MINOR_VERSION 2+
-%global O4N_GIT_VERSION v3.2.1.6
-%global K8S_GIT_VERSION v1.2.0-36-g4a3f9c5b19c7
-%global kube_version 1.2.0
+%global O4N_GIT_MINOR_VERSION 3+
+%global O4N_GIT_VERSION v3.3.0.30
+%global K8S_GIT_VERSION v1.3.0-178-g52492b4
+%global kube_version 1.3.0
%global kube_git_version v%{kube_version}
#I really need this, otherwise "version_ldflags=$(kube::version_ldflags)"
@@ -60,7 +60,7 @@
Name: kubernetes
Version: %{kube_version}
-Release: 0.13.git%{shortcommit}%{?dist}
+Release: 0.2.git%{shortcommit}%{?dist}
Summary: Container cluster management
License: ASL 2.0
URL: %{import_path}
@@ -83,11 +83,7 @@ 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
-Patch14: hyperkube-kubectl-dont-shift-os.Args.patch
-Patch15: hyperkube.server-don-t-parse-args-for-any-command.patch
-
-# Disable v1beta3 by default
-Patch16: disable-v1beta3.patch
+Patch17: Hyperkube-remove-federation-cmds.patch
# It obsoletes cadvisor but needs its source code (literally integrated)
Obsoletes: cadvisor
@@ -178,11 +174,11 @@ Kubernetes client tools like kubectl
%setup -q -n %{repo}-%{commit}
# clean the directory up to Godeps
-dirs=$(ls | grep -v "^Godeps")
+dirs=$(ls | grep -v "^vendor")
rm -rf $dirs
# move k8s code from Godeps
-mv Godeps/_workspace/src/k8s.io/kubernetes/* .
+mv vendor/k8s.io/kubernetes/* .
# copy missing source code
cp ../%{k8s_repo}-%{k8s_commit}/cmd/kube-apiserver/apiserver.go cmd/kube-apiserver/.
cp ../%{k8s_repo}-%{k8s_commit}/cmd/kube-controller-manager/controller-manager.go cmd/kube-controller-manager/.
@@ -215,12 +211,7 @@ cp -r ../%{k8s_repo}-%{k8s_commit}/pkg/ui/data/swagger pkg/ui/data/.
# Drop apiserver from hyperkube
%patch13 -p1
-
-%patch14 -p1
-%patch15 -p1
-
-# disable v1beta3
-%patch16 -p1
+%patch17 -p1
%build
export KUBE_GIT_TREE_STATE="clean"
@@ -260,7 +251,7 @@ done
# install the bash completion
install -d -m 0755 %{buildroot}%{_datadir}/bash-completion/completions/
-install -t %{buildroot}%{_datadir}/bash-completion/completions/ contrib/completions/bash/kubectl
+%{buildroot}%{_bindir}/kubectl completion bash > %{buildroot}%{_datadir}/bash-completion/completions/kubectl
# install config files
install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}
@@ -281,6 +272,8 @@ install -d %{buildroot}%{_sharedstatedir}/kubelet
# place contrib/init/systemd/tmpfiles.d/kubernetes.conf to /usr/lib/tmpfiles.d/kubernetes.conf
install -d -m 0755 %{buildroot}%{_tmpfilesdir}
install -p -m 0644 -t %{buildroot}/%{_tmpfilesdir} contrib/init/systemd/tmpfiles.d/kubernetes.conf
+mkdir -p %{buildroot}/run
+install -d -m 0755 %{buildroot}/run/%{name}/
# enable CPU and Memory accounting
install -d -m 0755 %{buildroot}/%{_sysconfdir}/systemd/system.conf.d
@@ -303,6 +296,8 @@ chmod 0644 %{buildroot}%{_sharedstatedir}/kubernetes-unit-test/docs/devel/schedu
chmod 0755 %{buildroot}%{_sharedstatedir}/kubernetes-unit-test/hack/build-ui.sh
chmod 0644 %{buildroot}%{_sharedstatedir}/kubernetes-unit-test/hack/lib/util.sh
chmod 0644 %{buildroot}%{_sharedstatedir}/kubernetes-unit-test/docs/user-guide/ui.md
+chmod 0755 %{buildroot}%{_datadir}/bash-completion/completions/kubectl
+chmod 0644 %{buildroot}%{_sharedstatedir}/kubernetes-unit-test/cluster/gce/coreos/configure-node.sh
%check
# Fedora, RHEL7 and CentOS are tested via unit-test subpackage
@@ -346,6 +341,7 @@ fi
%config(noreplace) %{_sysconfdir}/%{name}/config
%config(noreplace) %{_sysconfdir}/%{name}/controller-manager
%{_tmpfilesdir}/kubernetes.conf
+%verify(not size mtime md5) %attr(755, kube,kube) %dir /run/%{name}
%files node
%license LICENSE
@@ -364,6 +360,7 @@ fi
%config(noreplace) %{_sysconfdir}/%{name}/proxy
%config(noreplace) %{_sysconfdir}/systemd/system.conf.d/kubernetes-accounting.conf
%{_tmpfilesdir}/kubernetes.conf
+%verify(not size mtime md5) %attr(755, kube,kube) %dir /run/%{name}
%files client
%license LICENSE
@@ -411,6 +408,17 @@ fi
%systemd_postun
%changelog
+* Wed Sep 07 2016 jchaloup <jchaloup@redhat.com> - 1.3.0-0.2.gitc5ee292
+- Fix permissions
+ related: #1373884
+
+* Wed Sep 07 2016 jchaloup <jchaloup@redhat.com> - 1.3.0-0.1.gitc5ee292
+- Update to ose v3.3.0.30
+ resolves: #1373884
+
+* Wed Jul 13 2016 jchaloup <jchaloup@redhat.com> - 1.2.0-0.14.gitec7364b
+- Own /run/kubernetes directory
+
* Mon Jul 11 2016 jchaloup <jchaloup@redhat.com> - 1.2.0-0.13.gitec7364b
- Update to ose v3.2.1.6
Enable CPU and Memory accounting on a node