Browse code
Update flannel and calico k8s policy
Change-Id: I66d25376fa540728db79bc0dc9f03fe8ebaac76a
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/4346
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Vinay Kulkarni <kulkarniv@vmware.com>
Vinay Kulkarni authored on 2017/11/18 11:29:40Showing 2 changed files
| ... | ... |
@@ -1,15 +1,17 @@ |
| 1 | 1 |
Summary: Calico Network Policy for Kubernetes |
| 2 | 2 |
Name: calico-k8s-policy |
| 3 |
-Version: 0.7.0 |
|
| 3 |
+Version: 1.0.0 |
|
| 4 | 4 |
Release: 1%{?dist}
|
| 5 | 5 |
License: Apache-2.0 |
| 6 | 6 |
URL: https://github.com/projectcalico/k8s-policy |
| 7 | 7 |
Source0: %{name}-%{version}.tar.gz
|
| 8 |
-%define sha1 calico-k8s-policy=4a2fb4a877c130a14e7836ea75e27397aa9f6fbc |
|
| 8 |
+%define sha1 calico-k8s-policy=612eafdb2afee6ffbfc432e0110c787823b66ccc |
|
| 9 | 9 |
Group: Development/Tools |
| 10 | 10 |
Vendor: VMware, Inc. |
| 11 | 11 |
Distribution: Photon |
| 12 | 12 |
BuildRequires: git |
| 13 |
+BuildRequires: glide |
|
| 14 |
+BuildRequires: go >= 1.8 |
|
| 13 | 15 |
BuildRequires: libcalico |
| 14 | 16 |
BuildRequires: libffi |
| 15 | 17 |
BuildRequires: openssl-devel |
| ... | ... |
@@ -61,9 +63,16 @@ Calico Network Policy enables Calico to enforce network policy on top of Calico |
| 61 | 61 |
echo "VERSION='`git describe --tags --dirty`'" > version.py |
| 62 | 62 |
|
| 63 | 63 |
%build |
| 64 |
-pyinstaller controller.py -ayF |
|
| 64 |
+mkdir -p /root/.glide |
|
| 65 |
+mkdir -p ${GOPATH}/src/github.com/projectcalico/k8s-policy
|
|
| 66 |
+cp -r * ${GOPATH}/src/github.com/projectcalico/k8s-policy
|
|
| 67 |
+pushd ${GOPATH}/src/github.com/projectcalico/k8s-policy
|
|
| 68 |
+glide install -strip-vendor |
|
| 69 |
+mkdir -p dist |
|
| 70 |
+CGO_ENABLED=0 go build -v -o dist/controller -ldflags "-X main.VERSION=%{version}" ./main.go
|
|
| 65 | 71 |
|
| 66 | 72 |
%install |
| 73 |
+pushd ${GOPATH}/src/github.com/projectcalico/k8s-policy
|
|
| 67 | 74 |
install -vdm 755 %{buildroot}%{_bindir}
|
| 68 | 75 |
install -vpm 0755 -t %{buildroot}%{_bindir}/ dist/controller
|
| 69 | 76 |
|
| ... | ... |
@@ -72,6 +81,8 @@ install -vpm 0755 -t %{buildroot}%{_bindir}/ dist/controller
|
| 72 | 72 |
%{_bindir}/controller
|
| 73 | 73 |
|
| 74 | 74 |
%changelog |
| 75 |
+* Fri Nov 17 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.0.0-1 |
|
| 76 |
+- Calico kubernetes policy v1.0.0. |
|
| 75 | 77 |
* Wed Nov 08 2017 Vinay Kulkarni <kulkarniv@vmware.com> 0.7.0-1 |
| 76 | 78 |
- Calico kubernetes policy v0.7.0. |
| 77 | 79 |
* Fri Oct 13 2017 Vinay Kulkarni <kulkarniv@vmware.com> 0.5.4-1 |
| ... | ... |
@@ -1,11 +1,11 @@ |
| 1 | 1 |
Summary: Overlay network for containers based on etcd |
| 2 | 2 |
Name: flannel |
| 3 |
-Version: 0.8.0 |
|
| 4 |
-Release: 2%{?dist}
|
|
| 3 |
+Version: 0.9.0 |
|
| 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=d8eb057233de1babd306297d4fc3af098ccbea16 |
|
| 8 |
+%define sha1 flannel=3d27b1d1747b9c3706a711955b0f9a67046b0841 |
|
| 9 | 9 |
Group: Development/Tools |
| 10 | 10 |
Vendor: VMware, Inc. |
| 11 | 11 |
Distribution: Photon |
| ... | ... |
@@ -97,6 +97,8 @@ popd |
| 97 | 97 |
%config(noreplace) %{_sysconfdir}/flannel/flanneld
|
| 98 | 98 |
|
| 99 | 99 |
%changelog |
| 100 |
+* Fri Nov 17 2017 Vinay Kulkarni <kulkarniv@vmware.com> 0.9.0-1 |
|
| 101 |
+- Flannel 0.9.0. |
|
| 100 | 102 |
* Thu Oct 12 2017 Vinay Kulkarni <kulkarniv@vmware.com> 0.8.0-2 |
| 101 | 103 |
- Create flannel network config if not exist, tolerate errcode if exists. |
| 102 | 104 |
* Fri Aug 11 2017 Vinay Kulkarni <kulkarniv@vmware.com> 0.8.0-1 |