diff --git a/Fix-Persistent-Volumes-and-Persistent-Volume-Claims.patch b/Fix-Persistent-Volumes-and-Persistent-Volume-Claims.patch new file mode 100644 index 0000000..d13745a --- /dev/null +++ b/Fix-Persistent-Volumes-and-Persistent-Volume-Claims.patch @@ -0,0 +1,68 @@ +From e77337bfa867704bb79b4224191bd69d5de3d847 Mon Sep 17 00:00:00 2001 +From: Jan Chaloupka +Date: Mon, 20 Jul 2015 20:13:42 +0200 +Subject: [PATCH] Fix Persistent Volumes and Persistent Volume Claims + +--- + hack/test-cmd.sh | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +diff --git a/hack/test-cmd.sh b/hack/test-cmd.sh +index f5088a7..18f1c87 100755 +--- a/hack/test-cmd.sh ++++ b/hack/test-cmd.sh +@@ -680,19 +680,19 @@ __EOF__ + + ### Create and delete persistent volume examples + # Pre-condition: no persistent volumes currently exist +- kube::test::get_object_assert pv "{{range.items}}{{.$id_field}}:{{end}}" '' ++ kube::test::get_object_assert pv "{{range.items}}{{$id_field}}:{{end}}" '' + # Command + kubectl create -f docs/user-guide/persistent-volumes/volumes/local-01.yaml "${kube_flags[@]}" +- kube::test::get_object_assert pv "{{range.items}}{{.$id_field}}:{{end}}" 'pv0001:' ++ kube::test::get_object_assert pv "{{range.items}}{{$id_field}}:{{end}}" 'pv0001:' + kubectl delete pv pv0001 "${kube_flags[@]}" + kubectl create -f docs/user-guide/persistent-volumes/volumes/local-02.yaml "${kube_flags[@]}" +- kube::test::get_object_assert pv "{{range.items}}{{.$id_field}}:{{end}}" 'pv0002:' ++ kube::test::get_object_assert pv "{{range.items}}{{$id_field}}:{{end}}" 'pv0002:' + kubectl delete pv pv0002 "${kube_flags[@]}" + kubectl create -f docs/user-guide/persistent-volumes/volumes/gce.yaml "${kube_flags[@]}" +- kube::test::get_object_assert pv "{{range.items}}{{.$id_field}}:{{end}}" 'pv0003:' ++ kube::test::get_object_assert pv "{{range.items}}{{$id_field}}:{{end}}" 'pv0003:' + kubectl delete pv pv0003 "${kube_flags[@]}" + # Post-condition: no PVs +- kube::test::get_object_assert pv "{{range.items}}{{.$id_field}}:{{end}}" '' ++ kube::test::get_object_assert pv "{{range.items}}{{$id_field}}:{{end}}" '' + + ############################ + # Persistent Volume Claims # +@@ -700,21 +700,21 @@ __EOF__ + + ### Create and delete persistent volume claim examples + # Pre-condition: no persistent volume claims currently exist +- kube::test::get_object_assert pvc "{{range.items}}{{.$id_field}}:{{end}}" '' ++ kube::test::get_object_assert pvc "{{range.items}}{{$id_field}}:{{end}}" '' + # Command + kubectl create -f docs/user-guide/persistent-volumes/claims/claim-01.yaml "${kube_flags[@]}" +- kube::test::get_object_assert pvc "{{range.items}}{{.$id_field}}:{{end}}" 'myclaim-1:' ++ kube::test::get_object_assert pvc "{{range.items}}{{$id_field}}:{{end}}" 'myclaim-1:' + kubectl delete pvc myclaim-1 "${kube_flags[@]}" + + kubectl create -f docs/user-guide/persistent-volumes/claims/claim-02.yaml "${kube_flags[@]}" +- kube::test::get_object_assert pvc "{{range.items}}{{.$id_field}}:{{end}}" 'myclaim-2:' ++ kube::test::get_object_assert pvc "{{range.items}}{{$id_field}}:{{end}}" 'myclaim-2:' + kubectl delete pvc myclaim-2 "${kube_flags[@]}" + + kubectl create -f docs/user-guide/persistent-volumes/claims/claim-03.json "${kube_flags[@]}" +- kube::test::get_object_assert pvc "{{range.items}}{{.$id_field}}:{{end}}" 'myclaim-3:' ++ kube::test::get_object_assert pvc "{{range.items}}{{$id_field}}:{{end}}" 'myclaim-3:' + kubectl delete pvc myclaim-3 "${kube_flags[@]}" + # Post-condition: no PVCs +- kube::test::get_object_assert pvc "{{range.items}}{{.$id_field}}:{{end}}" '' ++ kube::test::get_object_assert pvc "{{range.items}}{{$id_field}}:{{end}}" '' + + + +-- +1.9.3 + diff --git a/Update-github.com-elazarl-go-bindata-assetfs-to-at-l.patch b/Update-github.com-elazarl-go-bindata-assetfs-to-at-l.patch new file mode 100644 index 0000000..98d9d74 --- /dev/null +++ b/Update-github.com-elazarl-go-bindata-assetfs-to-at-l.patch @@ -0,0 +1,70 @@ +From de8f1b1fa8c8e592626071916565e3f03da5ec4a Mon Sep 17 00:00:00 2001 +From: Jan Chaloupka +Date: Mon, 20 Jul 2015 13:32:19 +0200 +Subject: [PATCH] Update github.com/elazarl/go-bindata-assetfs to at least + c57a80f1ab2ad67bafa83f5fd0b4c2ecbd253dd5. Otherwise kubernetes does not + compile with golang 1.5 due to + https://github.com/elazarl/go-bindata-assetfs/pull/13. + +--- + Godeps/Godeps.json | 2 +- + .../elazarl/go-bindata-assetfs/README.md | 38 +++++++++++-- + .../elazarl/go-bindata-assetfs/assetfs.go | 12 +++-- + .../go-bindata-assetfs/go-bindata-assetfs/main.go | 62 ++++++++++++++++++++++ + 4 files changed, 105 insertions(+), 9 deletions(-) + create mode 100644 Godeps/_workspace/src/github.com/elazarl/go-bindata-assetfs/go-bindata-assetfs/main.go + +diff --git a/Godeps/_workspace/src/github.com/elazarl/go-bindata-assetfs/assetfs.go b/Godeps/_workspace/src/github.com/elazarl/go-bindata-assetfs/assetfs.go +index 83cd94d..69d58f8 100644 +--- a/Godeps/_workspace/src/github.com/elazarl/go-bindata-assetfs/assetfs.go ++++ b/Godeps/_workspace/src/github.com/elazarl/go-bindata-assetfs/assetfs.go +@@ -3,7 +3,6 @@ package assetfs + import ( + "bytes" + "errors" +- "fmt" + "io" + "io/ioutil" + "net/http" +@@ -13,6 +12,10 @@ import ( + "time" + ) + ++var ( ++ fileTimestamp = time.Now() ++) ++ + // FakeFile implements os.FileInfo interface for a given path and size + type FakeFile struct { + // Path is the path of this file +@@ -37,7 +40,7 @@ func (f *FakeFile) Mode() os.FileMode { + } + + func (f *FakeFile) ModTime() time.Time { +- return time.Unix(0, 0) ++ return fileTimestamp + } + + func (f *FakeFile) Size() int64 { +@@ -70,6 +73,10 @@ func (f *AssetFile) Readdir(count int) ([]os.FileInfo, error) { + return nil, errors.New("not a directory") + } + ++func (f *AssetFile) Size() int64 { ++ return f.FakeFile.Size() ++} ++ + func (f *AssetFile) Stat() (os.FileInfo, error) { + return f, nil + } +@@ -98,7 +105,6 @@ func NewAssetDirectory(name string, children []string, fs *AssetFS) *AssetDirect + } + + func (f *AssetDirectory) Readdir(count int) ([]os.FileInfo, error) { +- fmt.Println(f, count) + if count <= 0 { + return f.Children, nil + } +-- +1.9.3 + diff --git a/kubernetes.spec b/kubernetes.spec index 5add84c..d65dbca 100644 --- a/kubernetes.spec +++ b/kubernetes.spec @@ -1,7 +1,7 @@ %if 0%{?fedora} %global with_devel 1 %global with_bundled 1 -%global with_debug 1 +%global with_debug 0 %else %global with_devel 0 %global with_bundled 1 @@ -30,15 +30,17 @@ Name: kubernetes Version: 1.0.0 -Release: 0.7.git%{shortcommit}%{?dist} +Release: 0.8.git%{shortcommit}%{?dist} Summary: Container cluster management License: ASL 2.0 URL: %{import_path} ExclusiveArch: x86_64 Source0: https://%{import_path}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz Source1: genmanpages.sh +Patch0: Update-github.com-elazarl-go-bindata-assetfs-to-at-l.patch +Patch1: Fix-Persistent-Volumes-and-Persistent-Volume-Claims.patch %if 0%{?with_debug} -Patch0: build-with-debug-info.patch +Patch2: build-with-debug-info.patch %endif # It obsoletes cadvisor but needs its source code (literally integrated) @@ -533,6 +535,10 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \ %systemd_postun %changelog +* Mon Jul 20 2015 jchaloup - 1.0.0-0.8.gitb2dafda +- Fix dependency and tests for go-1.5 +- with_debug off as the builds ends with error "ELFRESERVE too small: ..." + * Sat Jul 18 2015 Eric Paris - 1.0.0-0.7.gitb2dafda - Update apiserver binary gid