[kubernetes/f21] Bump to upstream 3623a01bf0e90de6345147eef62894057fe04b29
by Jan Chaloupka
commit 7a3a50fc01543393b88839d991f1d9a709f0f4b2
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Tue Jan 27 19:02:26 2015 +0100
Bump to upstream 3623a01bf0e90de6345147eef62894057fe04b29
.gitignore | 2 +-
kubernetes.spec | 45 +++++++++++++++++++++++++++++++++------------
sources | 2 +-
3 files changed, 35 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 28f5b7b..d6a651a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/kubernetes-b2f287c.tar.gz
+/kubernetes-3623a01.tar.gz
diff --git a/kubernetes.spec b/kubernetes.spec
index de476e3..fc4dbfd 100644
--- a/kubernetes.spec
+++ b/kubernetes.spec
@@ -5,7 +5,7 @@
%global project GoogleCloudPlatform
%global repo kubernetes
%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
-%global commit b2f287c259d856f4c08052a51cd7772c563aff77
+%global commit 3623a01bf0e90de6345147eef62894057fe04b29
%global shortcommit %(c=%{commit}; echo ${c:0:7})
#I really need this, otherwise "version_ldflags=$(kube::version_ldflags)"
@@ -14,8 +14,8 @@
%global _checkshell /bin/bash
Name: kubernetes
-Version: 0.8.2
-Release: 571.git%{shortcommit}%{?dist}
+Version: 0.9.1
+Release: 0.1.git%{shortcommit}%{?dist}
Summary: Container cluster management
License: ASL 2.0
URL: https://github.com/GoogleCloudPlatform/kubernetes
@@ -39,6 +39,8 @@ BuildRequires: etcd
BuildRequires: hostname
%if 0%{?fedora}
+Patch1: 0001-patch.patch
+
# needed for go cover. Not available in RHEL/CentOS (available in Fedora/EPEL)
BuildRequires: golang-cover
@@ -50,8 +52,12 @@ BuildRequires: golang(github.com/Sirupsen/logrus)
BuildRequires: golang(speter.net/go/exp/math/dec/inf)
BuildRequires: golang(github.com/rackspace/gophercloud/openstack)
BuildRequires: golang(code.google.com/p/gcfg)
-BuildRequires: golang(code.google.com/p/goauth2)
-BuildRequires: golang(code.google.com/p/google-api-go-client) > 0-0.3
+BuildRequires: golang(golang.org/x/oauth2)
+
+BuildRequires: golang(google.golang.org/api/compute/v1)
+BuildRequires: golang(google.golang.org/api/container/v1beta1)
+BuildRequires: golang(google.golang.org/api/googleapi)
+BuildRequires: golang(google.golang.org/api/googleapi/internal/uritemplates)
BuildRequires: golang(code.google.com/p/go-uuid)
BuildRequires: golang(github.com/coreos/go-etcd/etcd)
BuildRequires: golang(github.com/davecgh/go-spew/spew)
@@ -85,8 +91,10 @@ BuildRequires: golang(gopkg.in/v2/yaml)
Summary: %{summary}
BuildRequires: golang >= 1.2.1-3
BuildRequires: golang(github.com/spf13/cobra)
-BuildRequires: golang(code.google.com/p/google-api-go-client/compute/v1)
-BuildRequires: golang(code.google.com/p/google-api-go-client/container/v1beta1)
+BuildRequires: golang(google.golang.org/api/compute/v1)
+BuildRequires: golang(google.golang.org/api/container/v1beta1)
+BuildRequires: golang(google.golang.org/api/googleapi)
+BuildRequires: golang(google.golang.org/api/googleapi/internal/uritemplates)
BuildRequires: golang(speter.net/go/exp/math/dec/inf)
BuildRequires: golang(github.com/ghodss/yaml)
BuildRequires: golang(gopkg.in/v2/yaml)
@@ -107,7 +115,11 @@ BuildRequires: golang(github.com/fsouza/go-dockerclient)
BuildRequires: golang(github.com/mitchellh/goamz/aws)
BuildRequires: golang(github.com/mitchellh/goamz/ec2)
BuildRequires: golang(github.com/elazarl/go-bindata-assetfs)
-BuildRequires: golang(code.google.com/p/goauth2/compute/serviceaccount)
+BuildRequires: golang(golang.org/x/oauth2)
+BuildRequires: golang(golang.org/x/oauth2/google)
+BuildRequires: golang(golang.org/x/oauth2/internal)
+BuildRequires: golang(golang.org/x/oauth2/jws)
+BuildRequires: golang(golang.org/x/oauth2/jwt)
BuildRequires: golang(github.com/skynetservices/skydns/msg)
BuildRequires: golang(github.com/imdario/mergo)
BuildRequires: golang(github.com/spf13/pflag)
@@ -117,8 +129,10 @@ BuildRequires: golang(github.com/google/cadvisor/client)
BuildRequires: golang(github.com/google/cadvisor/info)
Requires: golang(github.com/spf13/cobra)
-Requires: golang(code.google.com/p/google-api-go-client/compute/v1)
-Requires: golang(code.google.com/p/google-api-go-client/container/v1beta1)
+Requires: golang(google.golang.org/api/compute/v1)
+Requires: golang(google.golang.org/api/container/v1beta1)
+Requires: golang(google.golang.org/api/googleapi)
+Requires: golang(google.golang.org/api/googleapi/internal/uritemplates)
Requires: golang(speter.net/go/exp/math/dec/inf)
Requires: golang(github.com/ghodss/yaml)
Requires: golang(gopkg.in/v2/yaml)
@@ -139,7 +153,11 @@ Requires: golang(github.com/fsouza/go-dockerclient)
Requires: golang(github.com/mitchellh/goamz/aws)
Requires: golang(github.com/mitchellh/goamz/ec2)
Requires: golang(github.com/elazarl/go-bindata-assetfs)
-Requires: golang(code.google.com/p/goauth2/compute/serviceaccount)
+Requires: golang(golang.org/x/oauth2)
+Requires: golang(golang.org/x/oauth2/google)
+Requires: golang(golang.org/x/oauth2/internal)
+Requires: golang(golang.org/x/oauth2/jws)
+Requires: golang(golang.org/x/oauth2/jwt)
Requires: golang(github.com/skynetservices/skydns/msg)
Requires: golang(github.com/imdario/mergo)
Requires: golang(github.com/spf13/pflag)
@@ -280,7 +298,7 @@ building other packages which use %{project}/%{repo}.
%build
export KUBE_GIT_TREE_STATE="clean"
export KUBE_GIT_COMMIT=%{commit}
-export KUBE_GIT_VERSION=v0.8.0-125-g68298f08a4980f
+export KUBE_GIT_VERSION=v0.9.1
%if 0%{?fedora}
export KUBE_GIT_TREE_STATE="dirty"
@@ -379,6 +397,9 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \
%systemd_postun
%changelog
+* Tue Jan 27 2015 jchaloup <jchaloup(a)redhat.com> - 0.9.1-0.1.git3623a01
+- Bump to upstream 3623a01bf0e90de6345147eef62894057fe04b29
+
* Thu Jan 22 2015 jchaloup <jchaloup(a)redhat.com> - 0.8.2-571.gitb2f287c
+- Bump to upstream b2f287c259d856f4c08052a51cd7772c563aff77
diff --git a/sources b/sources
index 0e53bcb..e5b23d2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0505be40de9e79a9bb9293ae90c42586 kubernetes-b2f287c.tar.gz
+b1c9f00734b27f11065fea7f13d73b3a kubernetes-3623a01.tar.gz
9 years, 4 months
[kubernetes/f21] Bump to upstream b2f287c259d856f4c08052a51cd7772c563aff77
by Jan Chaloupka
commit d46340d3b26b87cb3d1e23de45f6ec0139209006
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Thu Jan 22 20:13:51 2015 +0100
Bump to upstream b2f287c259d856f4c08052a51cd7772c563aff77
.gitignore | 3 +-
...r.service-not-docker.socket-in-unit-files.patch | 30 --------------------
kubernetes.spec | 11 ++++---
sources | 2 +-
4 files changed, 8 insertions(+), 38 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6a4f34d..28f5b7b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/clog
-/kubernetes-5b04640.tar.gz
+/kubernetes-b2f287c.tar.gz
diff --git a/kubernetes.spec b/kubernetes.spec
index d7e97f3..de476e3 100644
--- a/kubernetes.spec
+++ b/kubernetes.spec
@@ -5,7 +5,7 @@
%global project GoogleCloudPlatform
%global repo kubernetes
%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
-%global commit 5b046406a957a1e7eda7c0c86dd7a89e9c94fc5f
+%global commit b2f287c259d856f4c08052a51cd7772c563aff77
%global shortcommit %(c=%{commit}; echo ${c:0:7})
#I really need this, otherwise "version_ldflags=$(kube::version_ldflags)"
@@ -15,15 +15,13 @@
Name: kubernetes
Version: 0.8.2
-Release: 0.1.git%{shortcommit}%{?dist}
+Release: 571.git%{shortcommit}%{?dist}
Summary: Container cluster management
License: ASL 2.0
URL: https://github.com/GoogleCloudPlatform/kubernetes
ExclusiveArch: x86_64
Source0: https://github.com/GoogleCloudPlatform/kubernetes/archive/%{commit}/kuber...
-Patch1: Use-docker.service-not-docker.socket-in-unit-files.patch
-
%if 0%{?fedora} >= 21 || 0%{?rhel}
Requires: docker
%else
@@ -381,7 +379,10 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \
%systemd_postun
%changelog
-* Thu Jan 22 2015 Eric Paris <eparis(a)redhat.com>
+* Thu Jan 22 2015 jchaloup <jchaloup(a)redhat.com> - 0.8.2-571.gitb2f287c
++- Bump to upstream b2f287c259d856f4c08052a51cd7772c563aff77
+
+* Thu Jan 22 2015 Eric Paris <eparis(a)redhat.com> - 0.8.2-570.gitb2f287c
- patch kubelet service file to use docker.service not docker.socket
* Wed Jan 21 2015 jchaloup <jchaloup(a)redhat.com> - 0.8.2-0.1.git5b04640
diff --git a/sources b/sources
index d2ed745..0e53bcb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fddaa878001c447f85dc3e303f2507e0 kubernetes-5b04640.tar.gz
+0505be40de9e79a9bb9293ae90c42586 kubernetes-b2f287c.tar.gz
9 years, 4 months
[kubernetes/f21] patch kubelet service file to use docker.service not docker.socket
by Jan Chaloupka
commit 5cb36e81c10bc1f5af3d73a0b84724070b9fcec2
Author: Eric Paris <eparis(a)redhat.com>
Date: Thu Jan 22 12:02:18 2015 -0500
patch kubelet service file to use docker.service not docker.socket
...r.service-not-docker.socket-in-unit-files.patch | 30 ++++++++++++++++++++
kubernetes.spec | 5 +++
2 files changed, 35 insertions(+), 0 deletions(-)
---
diff --git a/Use-docker.service-not-docker.socket-in-unit-files.patch b/Use-docker.service-not-docker.socket-in-unit-files.patch
new file mode 100644
index 0000000..e9f6af3
--- /dev/null
+++ b/Use-docker.service-not-docker.socket-in-unit-files.patch
@@ -0,0 +1,30 @@
+From 388c179f016a11d401dd6bab91e41cbf12003ede Mon Sep 17 00:00:00 2001
+From: Eric Paris <eparis(a)redhat.com>
+Date: Thu, 22 Jan 2015 11:36:21 -0500
+Subject: [PATCH] Use docker.service not docker.socket in unit files
+
+Some distros, include RHEL and Fedora, are doing away with the docker
+socket by default in systemd units, for security reasons. Instead rely
+on the docker.service being started instead of socket activation.
+---
+ contrib/init/systemd/kubelet.service | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/contrib/init/systemd/kubelet.service b/contrib/init/systemd/kubelet.service
+index 52b5b85..6990f29 100644
+--- a/contrib/init/systemd/kubelet.service
++++ b/contrib/init/systemd/kubelet.service
+@@ -1,8 +1,8 @@
+ [Unit]
+ Description=Kubernetes Kubelet Server
+ Documentation=https://github.com/GoogleCloudPlatform/kubernetes
+-After=docker.socket cadvisor.service
+-Requires=docker.socket
++After=docker.service cadvisor.service
++Requires=docker.service
+
+ [Service]
+ EnvironmentFile=-/etc/kubernetes/config
+--
+2.1.0
+
diff --git a/kubernetes.spec b/kubernetes.spec
index 0708e27..d7e97f3 100644
--- a/kubernetes.spec
+++ b/kubernetes.spec
@@ -22,6 +22,8 @@ URL: https://github.com/GoogleCloudPlatform/kubernetes
ExclusiveArch: x86_64
Source0: https://github.com/GoogleCloudPlatform/kubernetes/archive/%{commit}/kuber...
+Patch1: Use-docker.service-not-docker.socket-in-unit-files.patch
+
%if 0%{?fedora} >= 21 || 0%{?rhel}
Requires: docker
%else
@@ -379,6 +381,9 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \
%systemd_postun
%changelog
+* Thu Jan 22 2015 Eric Paris <eparis(a)redhat.com>
+- patch kubelet service file to use docker.service not docker.socket
+
* Wed Jan 21 2015 jchaloup <jchaloup(a)redhat.com> - 0.8.2-0.1.git5b04640
- Bump to upstream 5b046406a957a1e7eda7c0c86dd7a89e9c94fc5f
9 years, 4 months
[kubernetes/f21] hostname is needed in %check
by Jan Chaloupka
commit 772622cd1cd49eca2377ab19a2eed829e631f7da
Author: Eric Paris <eparis(a)redhat.com>
Date: Wed Jan 21 19:47:56 2015 -0500
hostname is needed in %check
kubernetes.spec | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/kubernetes.spec b/kubernetes.spec
index 63fa7f8..0708e27 100644
--- a/kubernetes.spec
+++ b/kubernetes.spec
@@ -1,10 +1,10 @@
#debuginfo not supported with Go
%global debug_package %{nil}
-%global provider github
-%global provider_tld com
-%global project GoogleCloudPlatform
-%global repo kubernetes
-%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
+%global provider github
+%global provider_tld com
+%global project GoogleCloudPlatform
+%global repo kubernetes
+%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
%global commit 5b046406a957a1e7eda7c0c86dd7a89e9c94fc5f
%global shortcommit %(c=%{commit}; echo ${c:0:7})
@@ -36,6 +36,7 @@ BuildRequires: git
BuildRequires: golang >= 1.2-7
BuildRequires: systemd
BuildRequires: etcd
+BuildRequires: hostname
%if 0%{?fedora}
# needed for go cover. Not available in RHEL/CentOS (available in Fedora/EPEL)
9 years, 4 months
[kubernetes/f21] Bump to upstream 5b046406a957a1e7eda7c0c86dd7a89e9c94fc5f
by Jan Chaloupka
commit c75ada354d90172c79169f52d3f94e798d6ccecf
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Tue Jan 20 17:19:30 2015 +0100
Bump to upstream 5b046406a957a1e7eda7c0c86dd7a89e9c94fc5f
.gitignore | 32 +-------------------------------
kubernetes.spec | 19 +++++++++++--------
sources | 2 +-
3 files changed, 13 insertions(+), 40 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f828fe7..6a4f34d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,32 +1,2 @@
/clog
-/kubernetes-98ac8e1.tar.gz
-/kubernetes-4452163.tar.gz
-/kubernetes-b011263.tar.gz
-/kubernetes-d5377e4.tar.gz
-/kubernetes-e868642.tar.gz
-/kubernetes-97dd730.tar.gz
-/kubernetes-77d2815.tar.gz
-/kubernetes-e46af6e.tar.gz
-/kubernetes-dc7e3d6.tar.gz
-/kubernetes-1c61486.tar.gz
-/kubernetes-8e1d416.tar.gz
-/kubernetes-78df011.tar.gz
-/kubernetes-a18cdac.tar.gz
-/kubernetes-808be2d.tar.gz
-/kubernetes-a4abafe.tar.gz
-/kubernetes-5a649f2.tar.gz
-/kubernetes-3b1ef73.tar.gz
-/kubernetes-b695650.tar.gz
-/kubernetes-6c70227.tar.gz
-/kubernetes-30fcf24.tar.gz
-/kubernetes-df0981b.tar.gz
-/kubernetes-c6158b8.tar.gz
-/kubernetes-3f74a1e.tar.gz
-/kubernetes-162e498.tar.gz
-/kubernetes-64e07f7.tar.gz
-/kubernetes-ff1e9f4.tar.gz
-/kubernetes-6aabd98.tar.gz
-/kubernetes-993ef88.tar.gz
-/kubernetes-5ef34bf.tar.gz
-/kubernetes-52e165a.tar.gz
-/kubernetes-68298f0.tar.gz
+/kubernetes-5b04640.tar.gz
diff --git a/kubernetes.spec b/kubernetes.spec
index c223a3a..63fa7f8 100644
--- a/kubernetes.spec
+++ b/kubernetes.spec
@@ -1,7 +1,11 @@
#debuginfo not supported with Go
%global debug_package %{nil}
-%global import_path github.com/GoogleCloudPlatform/kubernetes
-%global commit 68298f08a4980f95dfbf7b9f58bfec1808fb2670
+%global provider github
+%global provider_tld com
+%global project GoogleCloudPlatform
+%global repo kubernetes
+%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
+%global commit 5b046406a957a1e7eda7c0c86dd7a89e9c94fc5f
%global shortcommit %(c=%{commit}; echo ${c:0:7})
#I really need this, otherwise "version_ldflags=$(kube::version_ldflags)"
@@ -10,18 +14,14 @@
%global _checkshell /bin/bash
Name: kubernetes
-Version: 0.8.0
-Release: 126.0.git%{shortcommit}%{?dist}
+Version: 0.8.2
+Release: 0.1.git%{shortcommit}%{?dist}
Summary: Container cluster management
License: ASL 2.0
URL: https://github.com/GoogleCloudPlatform/kubernetes
ExclusiveArch: x86_64
Source0: https://github.com/GoogleCloudPlatform/kubernetes/archive/%{commit}/kuber...
-%if 0%{?fedora}
-Patch1: 0001-remove-all-third-party-software.patch
-%endif
-
%if 0%{?fedora} >= 21 || 0%{?rhel}
Requires: docker
%else
@@ -378,6 +378,9 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \
%systemd_postun
%changelog
+* Wed Jan 21 2015 jchaloup <jchaloup(a)redhat.com> - 0.8.2-0.1.git5b04640
+- Bump to upstream 5b046406a957a1e7eda7c0c86dd7a89e9c94fc5f
+
* Sun Jan 18 2015 jchaloup <jchaloup(a)redhat.com> - 0.8.0-126.0.git68298f0
- Add some missing dependencies
- Add devel subpackage
diff --git a/sources b/sources
index e8ba4de..d2ed745 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6ff850813607d4d7cd769e22905597fd kubernetes-68298f0.tar.gz
+fddaa878001c447f85dc3e303f2507e0 kubernetes-5b04640.tar.gz
9 years, 4 months
[kubernetes/f21] Add devel subpackage
by Jan Chaloupka
commit 49a2c66054cd8f767c18c8f028aa21ef0bdf8e8f
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Mon Jan 19 00:47:08 2015 +0100
Add devel subpackage
kubernetes.spec | 198 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 198 insertions(+), 0 deletions(-)
---
diff --git a/kubernetes.spec b/kubernetes.spec
index 84cafb5..c223a3a 100644
--- a/kubernetes.spec
+++ b/kubernetes.spec
@@ -41,6 +41,10 @@ BuildRequires: etcd
# needed for go cover. Not available in RHEL/CentOS (available in Fedora/EPEL)
BuildRequires: golang-cover
+BuildRequires: golang(github.com/skynetservices/skydns/msg)
+BuildRequires: golang(github.com/imdario/mergo)
+BuildRequires: docker-io-devel
+BuildRequires: docker-io-pkg-devel
BuildRequires: golang(github.com/Sirupsen/logrus)
BuildRequires: golang(speter.net/go/exp/math/dec/inf)
BuildRequires: golang(github.com/rackspace/gophercloud/openstack)
@@ -76,6 +80,199 @@ BuildRequires: golang(gopkg.in/v2/yaml)
%description
%{summary}
+%package devel
+Summary: %{summary}
+BuildRequires: golang >= 1.2.1-3
+BuildRequires: golang(github.com/spf13/cobra)
+BuildRequires: golang(code.google.com/p/google-api-go-client/compute/v1)
+BuildRequires: golang(code.google.com/p/google-api-go-client/container/v1beta1)
+BuildRequires: golang(speter.net/go/exp/math/dec/inf)
+BuildRequires: golang(github.com/ghodss/yaml)
+BuildRequires: golang(gopkg.in/v2/yaml)
+BuildRequires: golang(github.com/gorilla/mux)
+BuildRequires: golang(github.com/rackspace/gophercloud)
+BuildRequires: golang(github.com/coreos/go-etcd/etcd)
+BuildRequires: golang(github.com/emicklei/go-restful)
+BuildRequires: golang(github.com/emicklei/go-restful/swagger)
+BuildRequires: golang(code.google.com/p/gcfg)
+BuildRequires: golang(code.google.com/p/go-uuid)
+BuildRequires: golang(golang.org/x/net/context)
+BuildRequires: golang(golang.org/x/net/html)
+BuildRequires: golang(golang.org/x/net/websocket)
+BuildRequires: golang(github.com/stretchr/testify/mock)
+BuildRequires: golang(github.com/google/gofuzz)
+BuildRequires: golang(github.com/golang/glog)
+BuildRequires: golang(github.com/fsouza/go-dockerclient)
+BuildRequires: golang(github.com/mitchellh/goamz/aws)
+BuildRequires: golang(github.com/mitchellh/goamz/ec2)
+BuildRequires: golang(github.com/elazarl/go-bindata-assetfs)
+BuildRequires: golang(code.google.com/p/goauth2/compute/serviceaccount)
+BuildRequires: golang(github.com/skynetservices/skydns/msg)
+BuildRequires: golang(github.com/imdario/mergo)
+BuildRequires: golang(github.com/spf13/pflag)
+BuildRequires: golang(github.com/davecgh/go-spew/spew)
+BuildRequires: golang(github.com/skratchdot/open-golang/open)
+BuildRequires: golang(github.com/google/cadvisor/client)
+BuildRequires: golang(github.com/google/cadvisor/info)
+
+Requires: golang(github.com/spf13/cobra)
+Requires: golang(code.google.com/p/google-api-go-client/compute/v1)
+Requires: golang(code.google.com/p/google-api-go-client/container/v1beta1)
+Requires: golang(speter.net/go/exp/math/dec/inf)
+Requires: golang(github.com/ghodss/yaml)
+Requires: golang(gopkg.in/v2/yaml)
+Requires: golang(github.com/gorilla/mux)
+Requires: golang(github.com/rackspace/gophercloud)
+Requires: golang(github.com/coreos/go-etcd/etcd)
+Requires: golang(github.com/emicklei/go-restful)
+Requires: golang(github.com/emicklei/go-restful/swagger)
+Requires: golang(code.google.com/p/gcfg)
+Requires: golang(code.google.com/p/go-uuid)
+Requires: golang(golang.org/x/net/context)
+Requires: golang(golang.org/x/net/html)
+Requires: golang(golang.org/x/net/websocket)
+Requires: golang(github.com/stretchr/testify/mock)
+Requires: golang(github.com/google/gofuzz)
+Requires: golang(github.com/golang/glog)
+Requires: golang(github.com/fsouza/go-dockerclient)
+Requires: golang(github.com/mitchellh/goamz/aws)
+Requires: golang(github.com/mitchellh/goamz/ec2)
+Requires: golang(github.com/elazarl/go-bindata-assetfs)
+Requires: golang(code.google.com/p/goauth2/compute/serviceaccount)
+Requires: golang(github.com/skynetservices/skydns/msg)
+Requires: golang(github.com/imdario/mergo)
+Requires: golang(github.com/spf13/pflag)
+Requires: golang(github.com/davecgh/go-spew/spew)
+Requires: golang(github.com/skratchdot/open-golang/open)
+Requires: golang(github.com/google/cadvisor/client)
+Requires: golang(github.com/google/cadvisor/info)
+
+Provides: golang(%{import_path}/test/integration) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/tools) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/api) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/api/meta) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/api/errors) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/api/errors/etcd) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/api/testapi) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/api/latest) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/api/validation) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/api/v1beta1) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/api/v1beta2) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/api/resource) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/api/v1beta3) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/kubecfg) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/controller) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/capabilities) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/auth/user) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/auth/handlers) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/auth/authenticator) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/auth/authenticator/bearertoken) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/auth/authorizer) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/auth/authorizer/abac) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/conversion) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/clientauth) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/service) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/labels) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/client) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/client/clientcmd) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/client/record) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/client/cache) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/kubelet) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/kubelet/dockertools) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/kubelet/envvars) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/kubelet/config) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/watch) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/watch/json) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/healthz) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/util) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/util/exec) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/util/errors) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/util/wait) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/util/iptables) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/util/mount) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/util/config) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/version) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/version/verflag) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/cloudprovider) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/cloudprovider/controller) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/cloudprovider/vagrant) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/cloudprovider/aws) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/cloudprovider/openstack) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/cloudprovider/ovirt) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/cloudprovider/fake) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/cloudprovider/gce) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/runtime) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/apiserver) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/standalone) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/ui) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/kubectl) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/kubectl/cmd) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/constraint) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/httplog) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/volume) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/health) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/registry) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/registry/controller) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/registry/minion) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/registry/service) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/registry/endpoint) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/registry/generic) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/registry/generic/etcd) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/registry/event) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/registry/binding) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/registry/registrytest) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/registry/etcd) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/registry/pod) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/credentialprovider) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/credentialprovider/gcp) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/master) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/master/ports) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/config) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/proxy) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/proxy/config) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/scheduler) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/admission) = %{version}-%{release}
+Provides: golang(%{import_path}/cluster/addons/dns/kube2sky) = %{version}-%{release}
+Provides: golang(%{import_path}/plugin/pkg/auth) = %{version}-%{release}
+Provides: golang(%{import_path}/plugin/pkg/auth/authenticator) = %{version}-%{release}
+Provides: golang(%{import_path}/plugin/pkg/auth/authenticator/request/union) = %{version}-%{release}
+Provides: golang(%{import_path}/plugin/pkg/auth/authenticator/request/basicauth) = %{version}-%{release}
+Provides: golang(%{import_path}/plugin/pkg/auth/authenticator/request/x509) = %{version}-%{release}
+Provides: golang(%{import_path}/plugin/pkg/auth/authenticator/password) = %{version}-%{release}
+Provides: golang(%{import_path}/plugin/pkg/auth/authenticator/password/allow) = %{version}-%{release}
+Provides: golang(%{import_path}/plugin/pkg/auth/authenticator/token/tokenfile) = %{version}-%{release}
+Provides: golang(%{import_path}/plugin/pkg/auth/authenticator/token/tokentest) = %{version}-%{release}
+Provides: golang(%{import_path}/plugin/pkg/scheduler) = %{version}-%{release}
+Provides: golang(%{import_path}/plugin/pkg/scheduler/factory) = %{version}-%{release}
+Provides: golang(%{import_path}/plugin/pkg/scheduler/algorithmprovider) = %{version}-%{release}
+Provides: golang(%{import_path}/plugin/pkg/scheduler/algorithmprovider/defaults) = %{version}-%{release}
+Provides: golang(%{import_path}/plugin/pkg/admission/deny) = %{version}-%{release}
+Provides: golang(%{import_path}/plugin/pkg/admission/admit) = %{version}-%{release}
+Provides: golang(%{import_path}/plugin/cmd/kube-scheduler) = %{version}-%{release}
+Provides: golang(%{import_path}/cmd/kube-apiserver) = %{version}-%{release}
+Provides: golang(%{import_path}/cmd/kubecfg) = %{version}-%{release}
+Provides: golang(%{import_path}/cmd/kube-proxy) = %{version}-%{release}
+Provides: golang(%{import_path}/cmd/kube-controller-manager) = %{version}-%{release}
+Provides: golang(%{import_path}/cmd/integration) = %{version}-%{release}
+Provides: golang(%{import_path}/cmd/kubelet) = %{version}-%{release}
+Provides: golang(%{import_path}/cmd/kubernetes) = %{version}-%{release}
+Provides: golang(%{import_path}/cmd/e2e) = %{version}-%{release}
+Provides: golang(%{import_path}/cmd/kubectl) = %{version}-%{release}
+Provides: golang(%{import_path}/contrib/for-tests/network-tester) = %{version}-%{release}
+Provides: golang(%{import_path}/contrib/srvexpand) = %{version}-%{release}
+Provides: golang(%{import_path}/contrib/flags2yaml) = %{version}-%{release}
+Provides: golang(%{import_path}/contrib/simplegen) = %{version}-%{release}
+Provides: golang(%{import_path}/contrib/for-demos/test-webserver) = %{version}-%{release}
+Provides: golang(%{import_path}/contrib/for-demos/serve_hostname) = %{version}-%{release}
+Provides: golang(%{import_path}/contrib/enscope) = %{version}-%{release}
+Provides: golang(%{import_path}/contrib/podex) = %{version}-%{release}
+
+%description devel
+%{summary}
+
+This package contains library source intended for
+building other packages which use %{project}/%{repo}.
+
%prep
%autosetup -Sgit -n %{name}-%{commit}
@@ -183,6 +380,7 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \
%changelog
* Sun Jan 18 2015 jchaloup <jchaloup(a)redhat.com> - 0.8.0-126.0.git68298f0
- Add some missing dependencies
+- Add devel subpackage
* Fri Jan 09 2015 Eric Paris <eparis(a)redhat.com> - 0.8.0-125.0.git68298f0
- Bump to upstream 68298f08a4980f95dfbf7b9f58bfec1808fb2670
9 years, 4 months
[kubernetes/f21] Add some missing dependencies
by Jan Chaloupka
commit f232c8e32c809ad4c9f2327843007a66151660a7
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Sun Jan 18 23:17:48 2015 +0100
Add some missing dependencies
kubernetes.spec | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/kubernetes.spec b/kubernetes.spec
index 985a0b9..84cafb5 100644
--- a/kubernetes.spec
+++ b/kubernetes.spec
@@ -11,7 +11,7 @@
Name: kubernetes
Version: 0.8.0
-Release: 125.0.git%{shortcommit}%{?dist}
+Release: 126.0.git%{shortcommit}%{?dist}
Summary: Container cluster management
License: ASL 2.0
URL: https://github.com/GoogleCloudPlatform/kubernetes
@@ -41,6 +41,9 @@ BuildRequires: etcd
# needed for go cover. Not available in RHEL/CentOS (available in Fedora/EPEL)
BuildRequires: golang-cover
+BuildRequires: golang(github.com/Sirupsen/logrus)
+BuildRequires: golang(speter.net/go/exp/math/dec/inf)
+BuildRequires: golang(github.com/rackspace/gophercloud/openstack)
BuildRequires: golang(code.google.com/p/gcfg)
BuildRequires: golang(code.google.com/p/goauth2)
BuildRequires: golang(code.google.com/p/google-api-go-client) > 0-0.3
@@ -54,11 +57,8 @@ BuildRequires: golang(github.com/ghodss/yaml)
BuildRequires: golang(github.com/golang/glog)
BuildRequires: golang(github.com/google/cadvisor) >= 0.6.2
BuildRequires: golang(github.com/google/gofuzz)
-BuildRequires: golang(github.com/kr/text)
BuildRequires: golang(github.com/mitchellh/goamz/aws)
BuildRequires: golang(github.com/mitchellh/goamz/ec2)
-BuildRequires: golang(github.com/mitchellh/mapstructure)
-BuildRequires: golang(github.com/racker/perigee)
BuildRequires: golang(github.com/rackspace/gophercloud)
BuildRequires: golang(github.com/skratchdot/open-golang/open)
BuildRequires: golang(github.com/spf13/cobra)
@@ -181,6 +181,9 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \
%systemd_postun
%changelog
+* Sun Jan 18 2015 jchaloup <jchaloup(a)redhat.com> - 0.8.0-126.0.git68298f0
+- Add some missing dependencies
+
* Fri Jan 09 2015 Eric Paris <eparis(a)redhat.com> - 0.8.0-125.0.git68298f0
- Bump to upstream 68298f08a4980f95dfbf7b9f58bfec1808fb2670
9 years, 4 months
[kubernetes/f20] Add patches
by Jan Chaloupka
commit 34efcfaf0f6222494f8e4d54ccc79e51afcb9a5b
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Wed Jan 28 19:26:45 2015 +0100
Add patches
rename-import-paths.patch | 27 +++++++++++++++++++++++++++
update-tests-to-etcd-2.0.patch | 32 ++++++++++++++++++++++++++++++++
2 files changed, 59 insertions(+), 0 deletions(-)
---
diff --git a/rename-import-paths.patch b/rename-import-paths.patch
new file mode 100644
index 0000000..f205138
--- /dev/null
+++ b/rename-import-paths.patch
@@ -0,0 +1,27 @@
+From 3eedc089ba9be8ac3c11bae084b95b8c34728a48 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Fri, 23 Jan 2015 15:05:29 +0100
+Subject: [PATCH] patch
+
+---
+ pkg/cloudprovider/gce/gce.go | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pkg/cloudprovider/gce/gce.go b/pkg/cloudprovider/gce/gce.go
+index 65e62f6..b240ac6 100644
+--- a/pkg/cloudprovider/gce/gce.go
++++ b/pkg/cloudprovider/gce/gce.go
+@@ -32,8 +32,8 @@ import (
+ "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource"
+ "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider"
+
+- compute "code.google.com/p/google-api-go-client/compute/v1"
+- container "code.google.com/p/google-api-go-client/container/v1beta1"
++ compute "google.golang.org/api/compute/v1"
++ container "google.golang.org/api/container/v1beta1"
+ "github.com/golang/glog"
+ "golang.org/x/oauth2"
+ "golang.org/x/oauth2/google"
+--
+1.9.3
+
diff --git a/update-tests-to-etcd-2.0.patch b/update-tests-to-etcd-2.0.patch
new file mode 100644
index 0000000..cda5729
--- /dev/null
+++ b/update-tests-to-etcd-2.0.patch
@@ -0,0 +1,32 @@
+From 8f1eb1cd89d155aee111b69db8b1b6af119a1422 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Wed, 28 Jan 2015 18:41:42 +0100
+Subject: [PATCH] update tests to etcd-2.0
+
+---
+ hack/lib/etcd.sh | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/hack/lib/etcd.sh b/hack/lib/etcd.sh
+index a783454..917649a 100644
+--- a/hack/lib/etcd.sh
++++ b/hack/lib/etcd.sh
+@@ -32,10 +32,13 @@ kube::etcd::start() {
+
+ # Start etcd
+ ETCD_DIR=$(mktemp -d -t test-etcd.XXXXXX)
+- etcd -name test -data-dir ${ETCD_DIR} -addr ${host}:${port} >/dev/null 2>/dev/null &
++ etcd -name default -data-dir ${ETCD_DIR} -addr ${host}:${port} >/dev/null 2>/dev/null &
+ ETCD_PID=$!
+
+- kube::util::wait_for_url "http://${host}:${port}/v2/keys/" "etcd: "
++ # no key => error on http://127.0.0.1:4001/v2/keys => test version
++ kube::util::wait_for_url "http://${host}:${port}/version" "etcd: "
++ # no key => error on http://127.0.0.1:4001/v2/keys => fails on integration test => add one key
++ curl -L http://${host}:${port}/v2/keys/kube_etcd_test_key -XPUT -d value="kube_etcd_test_key value"
+ }
+
+ kube::etcd::cleanup() {
+--
+1.9.3
+
9 years, 4 months
[kubernetes/f20] update tests for etcd-2.0
by Jan Chaloupka
commit 37450f348505927ffc4e3b98838e7ad596f165cf
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Wed Jan 28 18:43:21 2015 +0100
update tests for etcd-2.0
0001-patch.patch | 27 -
0001-remove-all-third-party-software.patch |206406 ----------------------------
kubernetes.spec | 15 +-
3 files changed, 14 insertions(+), 206434 deletions(-)
---
diff --git a/kubernetes.spec b/kubernetes.spec
index fc4dbfd..7781e1e 100644
--- a/kubernetes.spec
+++ b/kubernetes.spec
@@ -39,7 +39,8 @@ BuildRequires: etcd
BuildRequires: hostname
%if 0%{?fedora}
-Patch1: 0001-patch.patch
+Patch1: rename-import-paths.patch
+Patch2: update-tests-to-etcd-2.0.patch
# needed for go cover. Not available in RHEL/CentOS (available in Fedora/EPEL)
BuildRequires: golang-cover
@@ -359,6 +360,12 @@ install -p -m 644 docs/man/man1/* %{buildroot}%{_mandir}/man1
# install the place the kubelet defaults to put volumes
install -d %{buildroot}/var/lib/kubelet
+# install devel source codes
+install -d %{buildroot}/%{gopath}/src/%{import_path}
+for d in build cluster cmd contrib examples hack pkg plugin test; do
+ cp -rpav $d %{buildroot}/%{gopath}/src/%{import_path}/
+done
+
%files
%doc README.md LICENSE CONTRIB.md CONTRIBUTING.md DESIGN.md
%{_mandir}/man1/*
@@ -383,6 +390,11 @@ install -d %{buildroot}/var/lib/kubelet
%config(noreplace) %{_sysconfdir}/%{name}/kubelet
%config(noreplace) %{_sysconfdir}/%{name}/scheduler
+%files devel
+%doc README.md LICENSE CONTRIB.md CONTRIBUTING.md DESIGN.md
+%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
+%{gopath}/src/%{import_path}
+
%pre
getent group kube >/dev/null || groupadd -r kube
getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \
@@ -399,6 +411,7 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \
%changelog
* Tue Jan 27 2015 jchaloup <jchaloup(a)redhat.com> - 0.9.1-0.1.git3623a01
- Bump to upstream 3623a01bf0e90de6345147eef62894057fe04b29
+- update tests for etcd-2.0
* Thu Jan 22 2015 jchaloup <jchaloup(a)redhat.com> - 0.8.2-571.gitb2f287c
+- Bump to upstream b2f287c259d856f4c08052a51cd7772c563aff77
9 years, 4 months