Browse code
Update k8s v1.8.1, go, and calico v2.5.1
Change-Id: Ia54136a139b713ac0220f21d8bd780c0094622bd
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/4206
Tested-by: Sharath George
Reviewed-by: Sharath George
Vinay Kulkarni authored on 2017/11/02 09:16:16Showing 4 changed files
- SPECS/calico/calico.spec
- SPECS/go/go.spec
- SPECS/kubernetes-dns/kubernetes-dns.spec
- SPECS/kubernetes/kubernetes.spec
| ... | ... |
@@ -1,11 +1,11 @@ |
| 1 | 1 |
Summary: Calico node and documentation for project calico. |
| 2 | 2 |
Name: calico |
| 3 |
-Version: 2.4.1 |
|
| 3 |
+Version: 2.5.1 |
|
| 4 | 4 |
Release: 1%{?dist}
|
| 5 | 5 |
License: Apache-2.0 |
| 6 | 6 |
URL: https://github.com/projectcalico/calico |
| 7 | 7 |
Source0: %{name}-%{version}.tar.gz
|
| 8 |
-%define sha1 calico=2d26dbc187819231ec0d0e0fe096d5eb78aee691 |
|
| 8 |
+%define sha1 calico=f2f3589af6dfb7a00f9f578832802a85d2f8cf69 |
|
| 9 | 9 |
Group: Development/Tools |
| 10 | 10 |
Vendor: VMware, Inc. |
| 11 | 11 |
Distribution: Photon |
| ... | ... |
@@ -50,5 +50,7 @@ sed -i 's/. startup.env/source \/startup.env/g' %{buildroot}/usr/share/calico/do
|
| 50 | 50 |
/usr/share/calico/docker/fs/* |
| 51 | 51 |
|
| 52 | 52 |
%changelog |
| 53 |
+* Wed Nov 01 2017 Vinay Kulkarni <kulkarniv@vmware.com> 2.5.1-1 |
|
| 54 |
+- Calico Node v2.5.1. |
|
| 53 | 55 |
* Wed Aug 16 2017 Vinay Kulkarni <kulkarniv@vmware.com> 2.4.1-1 |
| 54 | 56 |
- Calico Node for PhotonOS. |
| ... | ... |
@@ -9,15 +9,15 @@ |
| 9 | 9 |
|
| 10 | 10 |
Summary: Go |
| 11 | 11 |
Name: go |
| 12 |
-Version: 1.8.1 |
|
| 13 |
-Release: 2%{?dist}
|
|
| 12 |
+Version: 1.9.1 |
|
| 13 |
+Release: 1%{?dist}
|
|
| 14 | 14 |
License: BSD |
| 15 | 15 |
URL: https://golang.org |
| 16 | 16 |
Group: System Environment/Security |
| 17 | 17 |
Vendor: VMware, Inc. |
| 18 | 18 |
Distribution: Photon |
| 19 | 19 |
Source0: https://storage.googleapis.com/golang/%{name}%{version}.src.tar.gz
|
| 20 |
-%define sha1 go=0c4b7116bd6b7cdc19bdcf8336c75eae4620907b |
|
| 20 |
+%define sha1 go=87cf0af3820834faeb6e63b035a1abae1f5b60b3 |
|
| 21 | 21 |
Patch0: go_imports_fix.patch |
| 22 | 22 |
Requires: glibc |
| 23 | 23 |
|
| ... | ... |
@@ -110,6 +110,8 @@ rm -rf %{buildroot}/*
|
| 110 | 110 |
%{_bindir}/*
|
| 111 | 111 |
|
| 112 | 112 |
%changelog |
| 113 |
+* Wed Nov 01 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.9.1-1 |
|
| 114 |
+- Update to golang release v1.9.1 |
|
| 113 | 115 |
* Wed May 31 2017 Xiaolin Li <xiaolinl@vmware.com> 1.8.1-2 |
| 114 | 116 |
- Remove mercurial from buildrequires and requires. |
| 115 | 117 |
* Tue Apr 11 2017 Danut Moraru <dmoraru@vmware.com> 1.8.1-1 |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: Kubernetes DNS |
| 2 | 2 |
Name: kubernetes-dns |
| 3 | 3 |
Version: 1.14.6 |
| 4 |
-Release: 1%{?dist}
|
|
| 4 |
+Release: 2%{?dist}
|
|
| 5 | 5 |
License: ASL 2.0 |
| 6 | 6 |
URL: https://github.com/kubernetes/dns/archive/%{version}.tar.gz
|
| 7 | 7 |
Source0: kubernetes-dns-%{version}.tar.gz
|
| ... | ... |
@@ -38,7 +38,7 @@ ARCH=${ARCH} VERSION=${VERSION} PKG=${PKG} go install \
|
| 38 | 38 |
|
| 39 | 39 |
%install |
| 40 | 40 |
install -m 755 -d %{buildroot}%{_bindir}
|
| 41 |
-binaries=(dnsmasq-nanny e2e ginkgo kube-dns sidecar sidecar-e2e) |
|
| 41 |
+binaries=(dnsmasq-nanny e2e kube-dns sidecar sidecar-e2e) |
|
| 42 | 42 |
for bin in "${binaries[@]}"; do
|
| 43 | 43 |
echo "+++ INSTALLING ${bin}"
|
| 44 | 44 |
install -pm 755 -t %{buildroot}%{_bindir} ${GOPATH}/bin/${bin}
|
| ... | ... |
@@ -59,12 +59,13 @@ rm -rf %{buildroot}/*
|
| 59 | 59 |
%defattr(-,root,root) |
| 60 | 60 |
%{_bindir}/dnsmasq-nanny
|
| 61 | 61 |
%{_bindir}/e2e
|
| 62 |
-%{_bindir}/ginkgo
|
|
| 63 | 62 |
%{_bindir}/kube-dns
|
| 64 | 63 |
%{_bindir}/sidecar
|
| 65 | 64 |
%{_bindir}/sidecar-e2e
|
| 66 | 65 |
|
| 67 | 66 |
%changelog |
| 67 |
+* Wed Nov 01 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.14.6-2 |
|
| 68 |
+- Remove go testing framework binary. |
|
| 68 | 69 |
* Mon Oct 02 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.14.6-1 |
| 69 | 70 |
- kubernetes-dns 1.14.6. |
| 70 | 71 |
* Mon Sep 11 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.14.4-1 |
| ... | ... |
@@ -1,11 +1,11 @@ |
| 1 | 1 |
Summary: Kubernetes cluster management |
| 2 | 2 |
Name: kubernetes |
| 3 |
-Version: 1.7.5 |
|
| 4 |
-Release: 2%{?dist}
|
|
| 3 |
+Version: 1.8.1 |
|
| 4 |
+Release: 1%{?dist}
|
|
| 5 | 5 |
License: ASL 2.0 |
| 6 | 6 |
URL: https://github.com/kubernetes/kubernetes/archive/v%{version}.tar.gz
|
| 7 | 7 |
Source0: kubernetes-v%{version}.tar.gz
|
| 8 |
-%define sha1 kubernetes-v%{version}.tar.gz=8010b6709278cf8b3d5e6aad151dcf89d504350e
|
|
| 8 |
+%define sha1 kubernetes-v%{version}.tar.gz=74bad7a52f3fc0b3c70e5ccc986a46a9fdfe358b
|
|
| 9 | 9 |
Source1: https://github.com/kubernetes/contrib/archive/contrib-0.7.0.tar.gz |
| 10 | 10 |
%define sha1 contrib-0.7.0=47a744da3b396f07114e518226b6313ef4b2203c |
| 11 | 11 |
Group: Development/Tools |
| ... | ... |
@@ -175,6 +175,8 @@ fi |
| 175 | 175 |
%{_bindir}/pause-amd64
|
| 176 | 176 |
|
| 177 | 177 |
%changelog |
| 178 |
+* Wed Nov 01 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.8.1-1 |
|
| 179 |
+- k8s v1.8.1. |
|
| 178 | 180 |
* Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 1.7.5-2 |
| 179 | 181 |
- Requires util-linux or toybox |
| 180 | 182 |
- Remove shadow from requires and use explicit tools for post actions |