From 58fdec92da62ebbdb3539bcad27e871f845a6d6b Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup@redhat.com>
Date: Mar 04 2016 14:51:44 +0000
Subject: Disable extensions/v1beta1 implicitly


---

diff --git a/disable-extensions-v1beta1-implicitly.patch b/disable-extensions-v1beta1-implicitly.patch
new file mode 100644
index 0000000..7664edb
--- /dev/null
+++ b/disable-extensions-v1beta1-implicitly.patch
@@ -0,0 +1,25 @@
+From a7be0ef7004dfbabd59a63223ff9e0d7bf24bfd6 Mon Sep 17 00:00:00 2001
+From: Jan Chaloupka <jchaloup@redhat.com>
+Date: Fri, 4 Mar 2016 13:56:08 +0100
+Subject: [PATCH] disable extensions/v1beta1 implicitly
+
+---
+ cmd/kube-apiserver/app/server.go | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmd/kube-apiserver/app/server.go b/cmd/kube-apiserver/app/server.go
+index 71cdf66..14c1ae0 100644
+--- a/cmd/kube-apiserver/app/server.go
++++ b/cmd/kube-apiserver/app/server.go
+@@ -443,7 +443,7 @@ func parseRuntimeConfig(s *options.APIServer) (map[string]genericapiserver.APIGr
+ 	disableExtensions := disableAllAPIs
+ 	extensionsGroupVersion := "extensions/v1beta1"
+ 	// TODO: Make this a loop over all group/versions when there are more of them.
+-	disableExtensions = !getRuntimeConfigValue(s, extensionsGroupVersion, !disableExtensions)
++	disableExtensions = !getRuntimeConfigValue(s, extensionsGroupVersion, disableExtensions)
+ 	if disableExtensions {
+ 		apiGroupVersionOverrides[extensionsGroupVersion] = genericapiserver.APIGroupVersionOverride{
+ 			Disable: true,
+-- 
+1.9.3
+
diff --git a/kubernetes.spec b/kubernetes.spec
index 5795951..a9317b6 100644
--- a/kubernetes.spec
+++ b/kubernetes.spec
@@ -61,7 +61,7 @@
 
 Name:		kubernetes
 Version:	%{kube_version}
-Release:	0.13.alpha6.git%{k8s_shortcommit}%{?dist}
+Release:	0.14.alpha6.git%{k8s_shortcommit}%{?dist}
 Summary:        Container cluster management
 License:        ASL 2.0
 URL:            %{import_path}
@@ -91,6 +91,7 @@ Patch12:        remove-apiserver-add-kube-prefix-for-hyperkube.patch
 Patch13:        disable-v1beta3.patch
 Patch14:        hyperkube-kubectl-dont-shift-os.Args.patch
 Patch15:        s.Flags-does-not-carry-all-flags-of-individual-optio.patch
+Patch16:        disable-extensions-v1beta1-implicitly.patch
 
 # It obsoletes cadvisor but needs its source code (literally integrated)
 Obsoletes:      cadvisor
@@ -632,6 +633,9 @@ cp -r ../%{k8s_repo}-%{k8s_commit}/cmd/hyperkube cmd/.
 %patch14 -p1
 %patch15 -p1
 
+# disable extensions/v1beta1 implicitly
+%patch16 -p1
+
 %build
 export KUBE_GIT_TREE_STATE="clean"
 export KUBE_GIT_COMMIT=%{commit}
@@ -826,6 +830,9 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \
 %systemd_postun
 
 %changelog
+* Fri Mar 04 2016 jchaloup <jchaloup@redhat.com> - 1.2.0-0.14.alpha6.gitf0cd09a
+- Disable extensions/v1beta1 implicitly
+
 * Tue Mar 01 2016 jchaloup <jchaloup@redhat.com> - 1.2.0-0.13.alpha6.gitf0cd09a
 - Hyperkube checks flags of individual commands/servers even if it does not define their flags.
   Thus resulting in 'uknown shorthand flag' error