From 338946621c5dd6c275b67fd349d3cc59facf7e92 Mon Sep 17 00:00:00 2001 From: Jan Chaloupka Date: May 22 2016 08:50:58 +0000 Subject: Bump to upstream 546a3771589bdb356777c646c6eca24914fdd48b - resolves: #1256978 --- diff --git a/.gitignore b/.gitignore index 4fbd06a..051e871 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cadvisor-cefada4.tar.gz +/cadvisor-546a377.tar.gz diff --git a/cadvisor.spec b/cadvisor.spec index 22217e4..00079e0 100644 --- a/cadvisor.spec +++ b/cadvisor.spec @@ -1,8 +1,6 @@ %if 0%{?fedora} || 0%{?rhel} == 6 %global with_devel 1 -# using older version of github.com/coreos/go-systemd -# which is no longer available on Fedora -%global with_bundled 1 +%global with_bundled 0 %global with_debug 1 %global with_check 1 %global with_unit_test 1 @@ -27,12 +25,12 @@ # https://github.com/google/cadvisor %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit cefada41b87c35294533638733c563a349b95f05 +%global commit 546a3771589bdb356777c646c6eca24914fdd48b %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: %{repo} -Version: 0.16.0.2 -Release: 4%{?dist} +Version: 0.22.2 +Release: 1%{?dist} Summary: Analyzes resource usage and performance characteristics of running containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -40,50 +38,47 @@ Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcomm Source1: cadvisor Source2: cadvisor.service -# If go_arches not defined fall through to implicit golang archs -%if 0%{?go_arches:1} -ExclusiveArch: %{go_arches} -%else -ExclusiveArch: %{ix86} x86_64 %{arm} -%endif -# If gccgo_arches does not fit or is not defined fall through to golang -%ifarch 0%{?gccgo_arches} -BuildRequires: gcc-go >= %{gccgo_min_vers} -%else -BuildRequires: golang -%endif +# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required +ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le +# If go_compiler is not set to 1, there is no virtual provide. Use golang instead. +BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} BuildRequires: git BuildRequires: systemd BuildRequires: glibc-static %if ! 0%{?with_bundled} -BuildRequires: docker-io-pkg-devel -BuildRequires: docker-io-devel -BuildRequires: golang(code.google.com/p/google-api-go-client/bigquery/v2) +#BuildRequires: docker-io-pkg-devel +#BuildRequires: docker-io-devel +# indirect deps of docker +#BuildRequires: golang(github.com/Sirupsen/logrus) + +BuildRequires: golang(github.com/SeanDolphin/bqschema) +BuildRequires: golang(github.com/Shopify/sarama) BuildRequires: golang(github.com/abbot/go-http-auth) +BuildRequires: golang(github.com/aws/aws-sdk-go/aws) +BuildRequires: golang(github.com/aws/aws-sdk-go/aws/ec2metadata) +BuildRequires: golang(github.com/aws/aws-sdk-go/aws/session) BuildRequires: golang(github.com/docker/docker/pkg/mount) -BuildRequires: golang(github.com/docker/docker/pkg/units) -BuildRequires: golang(github.com/docker/libcontainer) -BuildRequires: golang(github.com/docker/libcontainer/cgroups) -BuildRequires: golang(github.com/docker/libcontainer/cgroups/fs) -BuildRequires: golang(github.com/docker/libcontainer/configs) -BuildRequires: golang(github.com/fsouza/go-dockerclient) >= 0.2.1-6 +BuildRequires: golang(github.com/docker/go-units) +BuildRequires: golang(github.com/fsouza/go-dockerclient) BuildRequires: golang(github.com/garyburd/redigo/redis) BuildRequires: golang(github.com/golang/glog) -BuildRequires: golang(github.com/golang/mock/gomock) BuildRequires: golang(github.com/influxdb/influxdb/client) -BuildRequires: golang(github.com/kr/pretty) +BuildRequires: golang(github.com/mistifyio/go-zfs) +BuildRequires: golang(github.com/opencontainers/runc/libcontainer) +BuildRequires: golang(github.com/opencontainers/runc/libcontainer/cgroups) +BuildRequires: golang(github.com/opencontainers/runc/libcontainer/cgroups/fs) +BuildRequires: golang(github.com/opencontainers/runc/libcontainer/configs) BuildRequires: golang(github.com/prometheus/client_golang/prometheus) BuildRequires: golang(github.com/stretchr/testify/assert) BuildRequires: golang(github.com/stretchr/testify/mock) -BuildRequires: golang(github.com/stretchr/testify/require) BuildRequires: golang(golang.org/x/exp/inotify) BuildRequires: golang(golang.org/x/oauth2) BuildRequires: golang(golang.org/x/oauth2/jwt) +BuildRequires: golang(google.golang.org/api/bigquery/v2) BuildRequires: golang(google.golang.org/cloud/compute/metadata) -# indirect deps of docker -BuildRequires: golang(github.com/Sirupsen/logrus) +BuildRequires: golang(gopkg.in/olivere/elastic.v2) %endif %description @@ -108,54 +103,60 @@ Summary: %{summary} BuildArch: noarch %if 0%{?with_check} -BuildRequires: docker-io-pkg-devel -BuildRequires: golang(code.google.com/p/google-api-go-client/bigquery/v2) +#BuildRequires: docker-io-pkg-devel +BuildRequires: golang(github.com/Shopify/sarama) BuildRequires: golang(github.com/abbot/go-http-auth) +BuildRequires: golang(github.com/aws/aws-sdk-go/aws) +BuildRequires: golang(github.com/aws/aws-sdk-go/aws/ec2metadata) +BuildRequires: golang(github.com/aws/aws-sdk-go/aws/session) BuildRequires: golang(github.com/docker/docker/pkg/mount) -BuildRequires: golang(github.com/docker/docker/pkg/units) -BuildRequires: golang(github.com/docker/libcontainer) -BuildRequires: golang(github.com/docker/libcontainer/cgroups) -BuildRequires: golang(github.com/docker/libcontainer/cgroups/fs) -BuildRequires: golang(github.com/docker/libcontainer/configs) -BuildRequires: golang(github.com/fsouza/go-dockerclient) >= 0.2.1-6 +BuildRequires: golang(github.com/docker/go-units) +BuildRequires: golang(github.com/fsouza/go-dockerclient) BuildRequires: golang(github.com/garyburd/redigo/redis) BuildRequires: golang(github.com/golang/glog) -BuildRequires: golang(github.com/golang/mock/gomock) BuildRequires: golang(github.com/influxdb/influxdb/client) -BuildRequires: golang(github.com/kr/pretty) +BuildRequires: golang(github.com/mistifyio/go-zfs) +BuildRequires: golang(github.com/opencontainers/runc/libcontainer) +BuildRequires: golang(github.com/opencontainers/runc/libcontainer/cgroups) +BuildRequires: golang(github.com/opencontainers/runc/libcontainer/cgroups/fs) +BuildRequires: golang(github.com/opencontainers/runc/libcontainer/configs) BuildRequires: golang(github.com/prometheus/client_golang/prometheus) BuildRequires: golang(github.com/stretchr/testify/assert) BuildRequires: golang(github.com/stretchr/testify/mock) -BuildRequires: golang(github.com/stretchr/testify/require) BuildRequires: golang(golang.org/x/exp/inotify) BuildRequires: golang(golang.org/x/oauth2) BuildRequires: golang(golang.org/x/oauth2/jwt) +BuildRequires: golang(google.golang.org/api/bigquery/v2) BuildRequires: golang(google.golang.org/cloud/compute/metadata) +BuildRequires: golang(gopkg.in/olivere/elastic.v2) %endif -Requires: docker-io-pkg-devel -Requires: golang(code.google.com/p/google-api-go-client/bigquery/v2) +#Requires: docker-io-pkg-devel +Requires: golang(github.com/Shopify/sarama) Requires: golang(github.com/abbot/go-http-auth) +Requires: golang(github.com/aws/aws-sdk-go/aws) +Requires: golang(github.com/aws/aws-sdk-go/aws/ec2metadata) +Requires: golang(github.com/aws/aws-sdk-go/aws/session) Requires: golang(github.com/docker/docker/pkg/mount) -Requires: golang(github.com/docker/docker/pkg/units) -Requires: golang(github.com/docker/libcontainer) -Requires: golang(github.com/docker/libcontainer/cgroups) -Requires: golang(github.com/docker/libcontainer/cgroups/fs) -Requires: golang(github.com/docker/libcontainer/configs) +Requires: golang(github.com/docker/go-units) Requires: golang(github.com/fsouza/go-dockerclient) Requires: golang(github.com/garyburd/redigo/redis) Requires: golang(github.com/golang/glog) -Requires: golang(github.com/golang/mock/gomock) Requires: golang(github.com/influxdb/influxdb/client) -Requires: golang(github.com/kr/pretty) +Requires: golang(github.com/mistifyio/go-zfs) +Requires: golang(github.com/opencontainers/runc/libcontainer) +Requires: golang(github.com/opencontainers/runc/libcontainer/cgroups) +Requires: golang(github.com/opencontainers/runc/libcontainer/cgroups/fs) +Requires: golang(github.com/opencontainers/runc/libcontainer/configs) Requires: golang(github.com/prometheus/client_golang/prometheus) Requires: golang(github.com/stretchr/testify/assert) Requires: golang(github.com/stretchr/testify/mock) -Requires: golang(github.com/stretchr/testify/require) Requires: golang(golang.org/x/exp/inotify) Requires: golang(golang.org/x/oauth2) Requires: golang(golang.org/x/oauth2/jwt) +Requires: golang(google.golang.org/api/bigquery/v2) Requires: golang(google.golang.org/cloud/compute/metadata) +Requires: golang(gopkg.in/olivere/elastic.v2) Provides: golang(%{import_path}/api) = %{version}-%{release} Provides: golang(%{import_path}/cache) = %{version}-%{release} @@ -175,7 +176,6 @@ Provides: golang(%{import_path}/http/mux) = %{version}-%{release} Provides: golang(%{import_path}/info/v1) = %{version}-%{release} Provides: golang(%{import_path}/info/v1/test) = %{version}-%{release} Provides: golang(%{import_path}/info/v2) = %{version}-%{release} -Provides: golang(%{import_path}/integration/common) = %{version}-%{release} Provides: golang(%{import_path}/integration/framework) = %{version}-%{release} Provides: golang(%{import_path}/integration/tests/api) = %{version}-%{release} Provides: golang(%{import_path}/integration/tests/healthz) = %{version}-%{release} @@ -186,7 +186,9 @@ Provides: golang(%{import_path}/pages/static) = %{version}-%{release} Provides: golang(%{import_path}/storage) = %{version}-%{release} Provides: golang(%{import_path}/storage/bigquery) = %{version}-%{release} Provides: golang(%{import_path}/storage/bigquery/client) = %{version}-%{release} +Provides: golang(%{import_path}/storage/elasticsearch) = %{version}-%{release} Provides: golang(%{import_path}/storage/influxdb) = %{version}-%{release} +Provides: golang(%{import_path}/storage/kafka) = %{version}-%{release} Provides: golang(%{import_path}/storage/redis) = %{version}-%{release} Provides: golang(%{import_path}/storage/statsd) = %{version}-%{release} Provides: golang(%{import_path}/storage/statsd/client) = %{version}-%{release} @@ -195,10 +197,9 @@ Provides: golang(%{import_path}/storage/test) = %{version}-%{release} Provides: golang(%{import_path}/summary) = %{version}-%{release} Provides: golang(%{import_path}/utils) = %{version}-%{release} Provides: golang(%{import_path}/utils/cloudinfo) = %{version}-%{release} +Provides: golang(%{import_path}/utils/container) = %{version}-%{release} Provides: golang(%{import_path}/utils/cpuload) = %{version}-%{release} Provides: golang(%{import_path}/utils/cpuload/netlink) = %{version}-%{release} -Provides: golang(%{import_path}/utils/fs) = %{version}-%{release} -Provides: golang(%{import_path}/utils/fs/mockfs) = %{version}-%{release} Provides: golang(%{import_path}/utils/machine) = %{version}-%{release} Provides: golang(%{import_path}/utils/oomparser) = %{version}-%{release} Provides: golang(%{import_path}/utils/procfs) = %{version}-%{release} @@ -253,35 +254,6 @@ providing packages with %{import_path} prefix. %autosetup -Sgit -n %{repo}-%{commit} %build -# If gccgo_arches does not fit or is not defined fall through to golang -# gccco arches -%ifarch 0%{?gccgo_arches} -%if 0%{?gcc_go_build:1} -export GOCOMPILER='%{gcc_go_build}' -%else -echo "No compiler for SA" -exit 1 -%endif -# golang arches (due to ExclusiveArch) -%else -%if 0%{?golang_build:1} -export GOCOMPILER='%{golang_build}' -%else -export GOCOMPILER='go build' -%endif -%endif - -%if 0%{?with_debug} -%ifarch !0%{?gccgo_arches} -function gobuild { -local LDFLAGS="${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n')" -eval ${GOCOMPILER} -a -v -x "$@"; -} -%else -function gobuild { eval ${GOCOMPILER} -a -v -x "$@"; } -%endif -%endif - mkdir -p src/github.com/google ln -s ../../../ src/github.com/google/cadvisor @@ -291,7 +263,7 @@ export GOPATH=$(pwd):%{gopath} export GOPATH=$(pwd):$(pwd)/Godeps/_workspace:%{gopath} %endif -gobuild -o bin/cadvisor %{import_path} +%gobuild -o bin/cadvisor %{import_path} %install # main package binary @@ -307,8 +279,10 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service # source codes for building projects %if 0%{?with_devel} install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ +echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list # find all *.go but no *_test.go files and generate devel.file-list -for file in $(find . -iname "*.go" \! -iname "*_test.go" | grep -v "./Godeps") ./fs/statvfs.c; do +for file in $(find . -iname "*.go" \! -iname "*_test.go" | grep -v "./Godeps") ; do + echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file) cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list @@ -316,14 +290,16 @@ done %endif # testing files for this project -%if 0%{?with_unit_test} +%if 0%{?with_unit_test} && 0%{?with_devel} install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ # find all *_test.go files and generate unit-test.file-list -for file in $(find . -iname "*_test.go" | grep -v "./Godeps"); do +for file in $(find . -iname "*_test.go"); do + echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file) cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test.file-list done + for file in $(find . -iname "*.json" | grep -v "./Godeps") \ ./fs/test_resources/diskstats \ ./metrics/testdata/prometheus_metrics \ @@ -341,44 +317,38 @@ sort -u -o devel.file-list devel.file-list %check %if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel} -%ifarch 0%{?gccgo_arches} -function gotest { %{gcc_go_test} "$@"; } -%else -%if 0%{?golang_test:1} -function gotest { %{golang_test} "$@"; } -%else -function gotest { go test "$@"; } -%endif -%endif - %if ! 0%{?with_bundled} export GOPATH=%{buildroot}/%{gopath}:%{gopath} %else export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %endif -gotest %{import_path}/api -gotest %{import_path}/cache/memory -gotest %{import_path}/client -gotest %{import_path}/client/v2 -gotest %{import_path}/collector -gotest %{import_path}/container -gotest %{import_path}/container/raw -gotest %{import_path}/events -gotest %{import_path}/fs -gotest %{import_path}/info/v1 +%if ! 0%{?gotest:1} +%global gotest go test +%endif + +%gotest %{import_path}/api +%gotest %{import_path}/cache/memory +%gotest %{import_path}/client +%gotest %{import_path}/client/v2 +#%gotest %{import_path}/collector +%gotest %{import_path}/container +%gotest %{import_path}/container/raw +%gotest %{import_path}/events +%gotest %{import_path}/fs +%gotest %{import_path}/info/v1 # requires root #gotest %%{import_path}/integration/tests/api # mostly likely requires kubernetes running #gotest %%{import_path}/integration/tests/healthz -gotest %{import_path}/manager -gotest %{import_path}/metrics -gotest %{import_path}/storage/influxdb -gotest %{import_path}/summary -gotest %{import_path}/utils -gotest %{import_path}/utils/machine -gotest %{import_path}/utils/oomparser -gotest %{import_path}/utils/sysinfo +#%gotest %{import_path}/manager +%gotest %{import_path}/metrics +%gotest %{import_path}/storage/influxdb +%gotest %{import_path}/summary +%gotest %{import_path}/utils +%gotest %{import_path}/utils/machine +%gotest %{import_path}/utils/oomparser +%gotest %{import_path}/utils/sysinfo %endif %post @@ -390,8 +360,10 @@ gotest %{import_path}/utils/sysinfo %postun %systemd_postun +#define license tag if not already defined +%{!?_licensedir:%global license %doc} + %files -%{!?_licensedir:%global license %%doc} %license LICENSE %doc CHANGELOG.md README.md CONTRIBUTING.md AUTHORS %doc Godeps/Godeps.json @@ -401,22 +373,23 @@ gotest %{import_path}/utils/sysinfo %if 0%{?with_devel} %files devel -f devel.file-list -%{!?_licensedir:%global license %%doc} %license LICENSE %doc CHANGELOG.md README.md CONTRIBUTING.md AUTHORS %doc Godeps/Godeps.json %dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} -%dir %{gopath}/src/%{import_path} %endif %if 0%{?with_unit_test} && 0%{?with_devel} %files unit-test -f unit-test.file-list -%{!?_licensedir:%global license %%doc} %license LICENSE %doc CHANGELOG.md README.md CONTRIBUTING.md AUTHORS %endif %changelog +* Mon Apr 11 2016 jchaloup - 0.22.2-1 +- Bump to upstream 546a3771589bdb356777c646c6eca24914fdd48b + resolves: #1256978 + * Sat Apr 9 2016 Peter Robinson 0.16.0.2-4 - Package spec cleanups diff --git a/sources b/sources index 92f1ab9..3bfb044 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1f569684d276a7d5b2d8794ec6cb8833 cadvisor-cefada4.tar.gz +70474920ee42b2af3ae413bb642cdd67 cadvisor-546a377.tar.gz