1. photon
  2. Commit 65fb8a8ffdcef797f058dcd6d6d20612716ad951
Browse code

Update calico, cni, flannel, and calico-cni local-cache build.

Change-Id: I0d05d9c18d0756aa260214769a0163f031c14bec
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/4499
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Anish Swaminathan <anishs@vmware.com>

Vinay Kulkarni authored on 2017/12/09 08:23:27
Showing 4 changed files
SPECS/calico-cni/calico-cni.spec
History View file @ 65fb8a8
... ... 
@@ -1,11 +1,13 @@
1 1 
 Summary:        Calico networking for CNI
2 2 
 Name:           calico-cni
3 3 
 Version:        1.11.0
4 
-Release:        1%{?dist}
4 
+Release:        2%{?dist}
5 5 
 License:        ASL 2.0
6 6 
 URL:            https://github.com/projectcalico/cni-plugin
7 7 
 Source0:        %{name}-%{version}.tar.gz
8 8 
 %define sha1 calico-cni=0fee124daa5e3a5f72e9af28ca1df61e6c2443c3
9 
+Source1:        %{name}-vendor-cache-%{version}.tar.gz
10 
+%define sha1 calico-cni-vendor-cache=8683bb5598d807c8c1c85e0cd13944ac09f6f450
9 11 
 Group:          Development/Tools
10 12 
 Vendor:         VMware, Inc.
11 13 
 Distribution:   Photon
... ... 
@@ -32,9 +34,11 @@ cd bin
32 32 
 export GOBIN=`pwd`
33 33 
 export PATH=$PATH:$GOBIN
34 34 
 cd ../src/github.com/projectcalico/cni-plugin
35 
+install %{SOURCE1} .
36 
+mkdir -p ~/.glide
37 
+tar -C ~/.glide -xf %{SOURCE1}
35 38 
 glide install --strip-vendor
36 39 
 mkdir -p dist
37 
-make dist/portmap
38 40 
 CGO_ENABLED=0 go build -v -i -o dist/calico -ldflags "-X main.VERSION= -s -w" calico.go
39 41 
 CGO_ENABLED=0 go build -v -i -o dist/calico-ipam -ldflags "-X main.VERSION= -s -w" ipam/calico-ipam.go
40 42
... ... 
@@ -43,7 +47,6 @@ cd ../build/src/github.com/projectcalico/cni-plugin
43 43 
 install -vdm 755 %{buildroot}/opt/cni/bin
44 44 
 install -vpm 0755 -t %{buildroot}/opt/cni/bin/ dist/calico
45 45 
 install -vpm 0755 -t %{buildroot}/opt/cni/bin/ dist/calico-ipam
46 
-install -vpm 0755 -t %{buildroot}/opt/cni/bin/ dist/portmap
47 46 
 install -vdm 0755 %{buildroot}/usr/share/calico-cni/k8s
48 47 
 install -vpm 0755 -t %{buildroot}/usr/share/calico-cni/k8s/ k8s-install/scripts/install-cni.sh
49 48 
 install -vpm 0755 -t %{buildroot}/usr/share/calico-cni/k8s/ k8s-install/scripts/calico.conf.default
... ... 
@@ -52,11 +55,12 @@ install -vpm 0755 -t %{buildroot}/usr/share/calico-cni/k8s/ k8s-install/scripts/
52 52 
 %defattr(-,root,root)
53 53 
 /opt/cni/bin/calico
54 54 
 /opt/cni/bin/calico-ipam
55 
-/opt/cni/bin/portmap
56 55 
 /usr/share/calico-cni/k8s/install-cni.sh
57 56 
 /usr/share/calico-cni/k8s/calico.conf.default
58 57
59 58 
 %changelog
59 
+*   Thu Dec 07 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.11.0-2
60 
+-   Cache build dependencies in our repo.
60 61 
 *   Fri Nov 03 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.11.0-1
61 62 
 -   calico-cni v1.11.0.
62 63 
 *   Mon Aug 14 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.10.0-1
SPECS/calico/calico.spec
History View file @ 65fb8a8
... ... 
@@ -1,11 +1,11 @@
1 1 
 Summary:        Calico node and documentation for project calico.
2 2 
 Name:           calico
3 
-Version:        2.6.2
3 
+Version:        2.6.3
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=29e00d752e930121844eea4ebcef503a447c32d5
8 
+%define sha1 calico=6cc983c49618c95fbe6b3d63d6f45725df577c7c
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 
+*   Tue Dec 05 2017 Vinay Kulkarni <kulkarniv@vmware.com> 2.6.3-1
54 
+-   Calico Node v2.6.3.
53 55 
 *   Fri Nov 03 2017 Vinay Kulkarni <kulkarniv@vmware.com> 2.6.2-1
54 56 
 -   Calico Node v2.6.2.
55 57 
 *   Wed Nov 01 2017 Vinay Kulkarni <kulkarniv@vmware.com> 2.5.1-1
SPECS/cni/cni.spec
History View file @ 65fb8a8
... ... 
@@ -1,11 +1,11 @@
1 1 
 Summary:        Container Network Interface (CNI) plugins
2 2 
 Name:           cni
3 
-Version:        0.5.1
3 
+Version:        0.6.0
4 4 
 Release:        1%{?dist}
5 5 
 License:        ASL 2.0
6 6 
 URL:            https://github.com/containernetworking/cni
7 7 
 Source0:        https://github.com/containernetworking/cni/archive/%{name}-v%{version}.tar.gz
8 
-%define sha1 cni=c704cff26d8e786ca0efbd1751bf51fb7f64f1b3
8 
+%define sha1 cni=f273e53c6d019d5cc9dfb75b48e619aa52abcce7
9 9 
 Group:          Development/Tools
10 10 
 Vendor:         VMware, Inc.
11 11 
 Distribution:   Photon
... ... 
@@ -16,10 +16,10 @@ BuildRequires:  go >= 1.5
16 16 
 The CNI (Container Network Interface) project consists of a specification and libraries for writing plugins to configure network interfaces in Linux containers, along with a number of supported plugins.
17 17
18 18 
 %prep
19 
-%setup -n %{name}-%{version}
19 
+%setup -n plugins-%{version}
20 20
21 21 
 %build
22 
-./build
22 
+./build.sh
23 23
24 24 
 %install
25 25 
 install -vdm 755 %{buildroot}%{_default_cni_plugins_dir}
... ... 
@@ -37,6 +37,8 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
37 37 
 %{_default_cni_plugins_dir}/*
38 38
39 39 
 %changelog
40 
+*   Tue Dec 05 2017 Vinay Kulkarni <kulkarniv@vmware.com> 0.6.0-1
41 
+-   cni v0.6.0.
40 42 
 *   Fri Apr 7 2017 Alexey Makhalov <amakhalov@vmware.com> 0.5.1-1
41 43 
 -   Version update
42 44 
 *   Thu Feb 16 2017 Vinay Kulkarni <kulkarniv@vmware.com> 0.4.0-1
SPECS/flannel/flannel.spec
History View file @ 65fb8a8
... ... 
@@ -1,11 +1,11 @@
1 1 
 Summary:        Overlay network for containers based on etcd
2 2 
 Name:           flannel
3 
-Version:        0.9.0
3 
+Version:        0.9.1
4 4 
 Release:        1%{?dist}
5 5 
 License:        ASL 2.0
6 6 
 URL:            https://github.com/coreos/flannel
7 7 
 Source0:        https://github.com/coreos/flannel/archive/%{name}-%{version}.tar.gz
8 
-%define sha1 flannel=3d27b1d1747b9c3706a711955b0f9a67046b0841
8 
+%define sha1 flannel=6182ef01f4ce21c1173c3124983b4d2b9331d28a
9 9 
 Group:          Development/Tools
10 10 
 Vendor:         VMware, Inc.
11 11 
 Distribution:   Photon
... ... 
@@ -93,6 +93,8 @@ GOPATH=%{_builddir} make test
93 93 
 %config(noreplace) %{_sysconfdir}/flannel/flanneld.conf
94 94
95 95 
 %changelog
96 
+*   Tue Dec 05 2017 Vinay Kulkarni <kulkarniv@vmware.com> 0.9.1-1
97 
+-   Flannel 0.9.1.
96 98 
 *   Tue Nov 14 2017 Vinay Kulkarni <kulkarniv@vmware.com> 0.9.0-1
97 99 
 -   Flannel 0.9.0.
98 100 
 *   Fri Sep 01 2017 Chang Lee <changlee@vmware.com> 0.8.0-2