Browse code
Update calico-node and calico-cni
Change-Id: I0d93b3a441791d7ad00568bbed01c9eb06d041fa
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/4211
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Xiaolin Li <xiaolinl@vmware.com>
(cherry picked from commit 9df7ea4949b0e41208319ff804c0154dbaa4be21)
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/4498
Reviewed-by: Vinay Kulkarni <kulkarniv@vmware.com>
Vinay Kulkarni authored on 2017/11/04 09:37:24Showing 4 changed files
- SPECS/calico-cni/calico-cni.spec
- SPECS/calico-confd/calico-confd.spec
- SPECS/calico-felix/calico-felix.spec
- SPECS/calico/calico.spec
| ... | ... |
@@ -1,11 +1,11 @@ |
| 1 | 1 |
Summary: Calico networking for CNI |
| 2 | 2 |
Name: calico-cni |
| 3 |
-Version: 1.10.0 |
|
| 3 |
+Version: 1.11.0 |
|
| 4 | 4 |
Release: 1%{?dist}
|
| 5 | 5 |
License: ASL 2.0 |
| 6 | 6 |
URL: https://github.com/projectcalico/cni-plugin |
| 7 | 7 |
Source0: %{name}-%{version}.tar.gz
|
| 8 |
-%define sha1 calico-cni=6c7f7e59e8f632e1630685f5bf092c2e4a60550f |
|
| 8 |
+%define sha1 calico-cni=0fee124daa5e3a5f72e9af28ca1df61e6c2443c3 |
|
| 9 | 9 |
Group: Development/Tools |
| 10 | 10 |
Vendor: VMware, Inc. |
| 11 | 11 |
Distribution: Photon |
| ... | ... |
@@ -57,5 +57,7 @@ install -vpm 0755 -t %{buildroot}/usr/share/calico-cni/k8s/ k8s-install/scripts/
|
| 57 | 57 |
/usr/share/calico-cni/k8s/calico.conf.default |
| 58 | 58 |
|
| 59 | 59 |
%changelog |
| 60 |
+* Fri Nov 03 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.11.0-1 |
|
| 61 |
+- calico-cni v1.11.0. |
|
| 60 | 62 |
* Mon Aug 14 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.10.0-1 |
| 61 | 63 |
- calico-cni for PhotonOS. |
| ... | ... |
@@ -1,6 +1,6 @@ |
| 1 | 1 |
Summary: confd is a lightweight configuration management tool |
| 2 | 2 |
Name: calico-confd |
| 3 |
-Version: 0.12.0 |
|
| 3 |
+Version: 0.14.0 |
|
| 4 | 4 |
Release: 1%{?dist}
|
| 5 | 5 |
Group: Applications/System |
| 6 | 6 |
Vendor: VMware, Inc. |
| ... | ... |
@@ -10,7 +10,7 @@ Source0: %{name}-%{version}.tar.gz
|
| 10 | 10 |
Distribution: Photon |
| 11 | 11 |
BuildRequires: glide |
| 12 | 12 |
BuildRequires: go >= 1.7 |
| 13 |
-%define sha1 calico-confd=61b15d926ebb87b466b7355d31e542109f0fad2a |
|
| 13 |
+%define sha1 calico-confd=1ee7b4f992737f28a970dfeeb35faa35d1601a92 |
|
| 14 | 14 |
|
| 15 | 15 |
%description |
| 16 | 16 |
confd is a lightweight configuration management tool that keeps local configuration files up-to-date, and reloading applications to pick up new config file changes. |
| ... | ... |
@@ -23,7 +23,7 @@ confd is a lightweight configuration management tool that keeps local configurat |
| 23 | 23 |
mkdir -p ${GOPATH}/src/github.com/kelseyhightower/confd
|
| 24 | 24 |
cp -r * ${GOPATH}/src/github.com/kelseyhightower/confd/.
|
| 25 | 25 |
pushd ${GOPATH}/src/github.com/kelseyhightower/confd
|
| 26 |
-./build |
|
| 26 |
+make build |
|
| 27 | 27 |
|
| 28 | 28 |
%install |
| 29 | 29 |
pushd ${GOPATH}/src/github.com/kelseyhightower/confd
|
| ... | ... |
@@ -35,5 +35,7 @@ install -vpm 0755 -t %{buildroot}%{_bindir}/ bin/confd
|
| 35 | 35 |
%{_bindir}/confd
|
| 36 | 36 |
|
| 37 | 37 |
%changelog |
| 38 |
+* Fri Nov 03 2017 Vinay Kulkarni <kulkarniv@vmware.com> 0.14.0-1 |
|
| 39 |
+- Calico confd v0.14.0 |
|
| 38 | 40 |
* Fri Aug 18 2017 Vinay Kulkarni <kulkarniv@vmware.com> 0.12.0-1 |
| 39 | 41 |
- Calico confd for PhotonOS. |
| ... | ... |
@@ -1,13 +1,13 @@ |
| 1 | 1 |
Summary: A per-host daemon for Calico |
| 2 | 2 |
Name: calico-felix |
| 3 |
-Version: 2.4.1 |
|
| 4 |
-Release: 2%{?dist}
|
|
| 3 |
+Version: 2.6.0 |
|
| 4 |
+Release: 1%{?dist}
|
|
| 5 | 5 |
Group: Applications/System |
| 6 | 6 |
Vendor: VMware, Inc. |
| 7 | 7 |
License: Apache-2.0 |
| 8 | 8 |
URL: https://github.com/projectcalico/felix |
| 9 | 9 |
Source0: %{name}-%{version}.tar.gz
|
| 10 |
-%define sha1 calico-felix=4408e0b30fee66d8813bf0351094f4b4af7d6813 |
|
| 10 |
+%define sha1 calico-felix=24f20292c2132e1b912e99a8b6977e2af6cd7b39 |
|
| 11 | 11 |
Source1: gogo-protobuf-0.4.tar.gz |
| 12 | 12 |
%define sha1 gogo-protobuf-0.4=4fc5dda432ad929ce203486c861b7d3e48681150 |
| 13 | 13 |
Distribution: Photon |
| ... | ... |
@@ -52,6 +52,8 @@ install ${GOPATH}/src/github.com/projectcalico/felix/bin/calico-felix %{buildroo
|
| 52 | 52 |
%{_bindir}/calico-felix
|
| 53 | 53 |
|
| 54 | 54 |
%changelog |
| 55 |
+* Fri Nov 03 2017 Vinay Kulkarni <kulkarniv@vmware.com> 2.6.0-1 |
|
| 56 |
+- Calico Felix v2.6.0. |
|
| 55 | 57 |
* Tue Sep 12 2017 Vinay Kulkarni <kulkarniv@vmware.com> 2.4.1-2 |
| 56 | 58 |
- Build protoc-gen-gogofaster plugin from source. |
| 57 | 59 |
* Sat Aug 19 2017 Vinay Kulkarni <kulkarniv@vmware.com> 2.4.1-1 |
| ... | ... |
@@ -1,11 +1,11 @@ |
| 1 | 1 |
Summary: Calico node and documentation for project calico. |
| 2 | 2 |
Name: calico |
| 3 |
-Version: 2.5.1 |
|
| 3 |
+Version: 2.6.2 |
|
| 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=f2f3589af6dfb7a00f9f578832802a85d2f8cf69 |
|
| 8 |
+%define sha1 calico=29e00d752e930121844eea4ebcef503a447c32d5 |
|
| 9 | 9 |
Group: Development/Tools |
| 10 | 10 |
Vendor: VMware, Inc. |
| 11 | 11 |
Distribution: Photon |
| ... | ... |
@@ -50,6 +50,8 @@ 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 |
+* Fri Nov 03 2017 Vinay Kulkarni <kulkarniv@vmware.com> 2.6.2-1 |
|
| 54 |
+- Calico Node v2.6.2. |
|
| 53 | 55 |
* Wed Nov 01 2017 Vinay Kulkarni <kulkarniv@vmware.com> 2.5.1-1 |
| 54 | 56 |
- Calico Node v2.5.1. |
| 55 | 57 |
* Wed Aug 16 2017 Vinay Kulkarni <kulkarniv@vmware.com> 2.4.1-1 |