Browse code

Update etcd and kubernetes packages

Vinay Kulkarni authored on 2015/07/29 04:14:32
Showing 2 changed files
... ...
@@ -1,21 +1,24 @@
1
-Summary:	Etcd-2.0.4
1
+Summary:	Etcd-2.1.1
2 2
 Name:		etcd
3
-Version:	2.0.4
3
+Version:	2.1.1
4 4
 Release:	1%{?dist}
5 5
 License:	Apache License
6 6
 URL:		https://github.com/coreos/etcd
7 7
 Group:		System Environment/Security
8 8
 Vendor:		VMware, Inc.
9 9
 Distribution:	Photon
10
-Source0:	https://github.com/coreos/etcd/releases/download/v2.0.4/%{name}-v%{version}-linux-amd64.tar.gz
11
-%define sha1 etcd=1aa350cfa94f8dccb855c4f9b1bbcda5eeddc6d0
10
+Source0:	https://github.com/coreos/etcd/releases/download/v2.1.1/%{name}-v%{version}-linux-amd64.tar.gz
11
+%define sha1 etcd=d90a29e051f8dea2f5bb4200610ccbcec45497d7
12 12
 Requires:	shadow
13
+
13 14
 %description
14 15
 A highly-available key value store for shared configuration and service discovery.
15 16
 
16 17
 %prep
17 18
 %setup -qn %{name}-v%{version}-linux-amd64
19
+
18 20
 %build
21
+
19 22
 %install
20 23
 install -vdm755 %{buildroot}%{_bindir}
21 24
 install -vdm755 %{buildroot}/%{_docdir}/%{name}-%{version}
... ...
@@ -25,19 +28,25 @@ chown -R root:root %{buildroot}/%{_docdir}/%{name}-%{version}
25 25
 
26 26
 mv %{_builddir}/%{name}-v%{version}-linux-amd64/etcd %{buildroot}%{_bindir}/
27 27
 mv %{_builddir}/%{name}-v%{version}-linux-amd64/etcdctl %{buildroot}%{_bindir}/
28
-mv %{_builddir}/%{name}-v%{version}-linux-amd64/etcd-migrate %{buildroot}%{_bindir}/
29 28
 mv %{_builddir}/%{name}-v%{version}-linux-amd64/README.md %{buildroot}/%{_docdir}/%{name}-%{version}/
30 29
 mv %{_builddir}/%{name}-v%{version}-linux-amd64/README-etcdctl.md %{buildroot}/%{_docdir}/%{name}-%{version}/
31 30
 
32 31
 %check
33 32
 make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
33
+
34 34
 %post	-p /sbin/ldconfig
35
+
35 36
 %postun	-p /sbin/ldconfig
37
+
36 38
 %clean
37 39
 rm -rf %{buildroot}/*
40
+
38 41
 %files
39
-%{_bindir}/*
42
+%{_bindir}/etcd*
40 43
 /%{_docdir}/%{name}-%{version}/*
44
+
41 45
 %changelog
46
+*	Tue Jul 21 2015 Vinay Kulkarni <kulkarniv@vmware.com> 2.1.1-1
47
+-	Update to version etcd v2.1.1
42 48
 *	Tue Mar 10 2015 Divya Thaluru <dthaluru@vmware.com> 2.0.4-1
43 49
 -	Initial build.	First version
... ...
@@ -1,27 +1,31 @@
1
-%global commit		ecca42643b91a7117de8cd385b64e6bafecefd65
1
+%global commit		6a5c06e3d1eb27a6310a09270e4a5fb1afa93e74
2 2
 %global shortcommit	%(c=%{commit}; echo ${c:0:7})
3 3
 
4 4
 Summary:	Kubernetes cluster management
5 5
 Name:		kubernetes
6
-Version:	0.12.0
6
+Version:	1.0.1
7 7
 Release:	1%{?dist}
8 8
 License:	ASL 2.0
9 9
 URL:		https://github.com/GoogleCloudPlatform/kubernetes
10
-Source0:	https://github.com/GoogleCloudPlatform/kubernetes/releases/download/v0.12.0/%{name}.tar.gz
11
-%define sha1 kubernetes.tar.gz=10d85777784f901a7476e642e7bab1776a834900
12
-Source1:	https://github.com/GoogleCloudPlatform/kubernetes/archive/%{commit}/kubernetes-ecca426.tar.gz
13
-%define sha1 kubernetes-ecca426=20cab37ca8ec5eddc0e530e5ce683ee6e8e5bb58
10
+Source0:	https://github.com/GoogleCloudPlatform/kubernetes/releases/download/v1.0.1/%{name}-v%{version}.tar.gz
11
+%define sha1 kubernetes-v1.0.1.tar.gz=39e56947e3a42bbec0641486710dcd829123c472
12
+Source1:	https://github.com/GoogleCloudPlatform/kubernetes/archive/%{commit}/kubernetes-6a5c06e.tar.gz
13
+%define sha1 kubernetes-6a5c06e=3cbb14cb1c4b6342f95b1277f177bc2342b77173
14 14
 Group:		Development/Tools
15 15
 Vendor:		VMware, Inc.
16 16
 Distribution: 	Photon
17 17
 Requires:	etcd >= 2.0.0
18 18
 Requires:	shadow
19
+
19 20
 %description
20 21
 Kubernetes is an open source implementation of container cluster management.
22
+
21 23
 %prep -p exit
22 24
 %setup -qn "./kubernetes"
23 25
 tar xf %{SOURCE1}
26
+
24 27
 %build
28
+
25 29
 %install
26 30
 install -vdm644 %{buildroot}/etc/profile.d
27 31
 install -vdm755 tmp
... ...
@@ -56,12 +60,15 @@ install -d %{buildroot}/var/lib/kubelet
56 56
 
57 57
 %check
58 58
 make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
59
+
59 60
 %clean
60 61
 rm -rf %{buildroot}/*
62
+
61 63
 %pre
62 64
 getent group kube >/dev/null || groupadd -r kube
63 65
 getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \
64 66
         -c "Kubernetes user" kube
67
+
65 68
 %files
66 69
 %defattr(-,root,root)
67 70
 %{_bindir}/*
... ...
@@ -80,6 +87,9 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \
80 80
 %config(noreplace) %{_sysconfdir}/%{name}/proxy
81 81
 %config(noreplace) %{_sysconfdir}/%{name}/kubelet
82 82
 %config(noreplace) %{_sysconfdir}/%{name}/scheduler
83
+
83 84
 %changelog
85
+*	Thu Jul 23 2015 Vinay Kulkarni <kulkarniv@vmware.com> 1.0.1-1
86
+-	Upgrade to kubernetes v1.0.1
84 87
 *	Tue Mar 10 2015 Divya Thaluru <dthaluru@vmware.com> 0.12.1-1
85 88
 -	Initial build. First version