SHA256
1
0
forked from pool/cri-tools

Accepting request 658047 from home:sgrunert:branches:devel:kubic

- Update cri-tools to v1.13.0:
  * CRI CLI (crictl):
    * Adds --auth options for pull command
    * Fixes URL parsing for exec and attach
    * Upgrades Go version to 1.11.1
    * Enables Windows CI on travis
    * Switches Windows default endpoints to npipe
    * Updates version matrix information for the project
    * Adds container name filter to ps command
    * Adds metadata to filters
    * Prints annotations and labels for inspect command
  * CRI validation testing (critest)
    * Add tests for multiple containers in a pod
    * Adds runtime handler support for critest
    * Adds exec sync timeout test cases
    * Fixes readonly filesystem test cases
- Add `crictl.yaml` to install directory
- Fix build for ppc64
- Require golang >= 1.11

OBS-URL: https://build.opensuse.org/request/show/658047
OBS-URL: https://build.opensuse.org/package/show/devel:kubic/cri-tools?expand=0&rev=5
This commit is contained in:
Richard Brown 2018-12-17 07:48:54 +00:00 committed by Git OBS Bridge
parent 9996d44ce3
commit 3795863dbf
6 changed files with 49 additions and 13 deletions

View File

@ -4,8 +4,8 @@
<param name="url">https://github.com/kubernetes-sigs/cri-tools.git</param>
<param name="scm">git</param>
<param name="filename">cri-tools</param>
<param name="versionformat">1.12.0</param>
<param name="revision">v1.12.0</param>
<param name="versionformat">1.13.0</param>
<param name="revision">v1.13.0</param>
</service>
<service name="recompress" mode="disabled">

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9c91c71a75d43d95fc6a5f2d93a8ed9a4a4d26ad3f6068c80a1925f3a75e3591
size 1438824

3
cri-tools-1.13.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5f539d42b4283f466239f9504d5620c04fb7f73b1f3861c855fedcd63b1409e0
size 1481804

View File

@ -1,3 +1,26 @@
-------------------------------------------------------------------
Fri Dec 14 10:51:01 UTC 2018 - Sascha Grunert <sgrunert@suse.com>
- Update cri-tools to v1.13.0:
* CRI CLI (crictl):
* Adds --auth options for pull command
* Fixes URL parsing for exec and attach
* Upgrades Go version to 1.11.1
* Enables Windows CI on travis
* Switches Windows default endpoints to npipe
* Updates version matrix information for the project
* Adds container name filter to ps command
* Adds metadata to filters
* Prints annotations and labels for inspect command
* CRI validation testing (critest)
* Add tests for multiple containers in a pod
* Adds runtime handler support for critest
* Adds exec sync timeout test cases
* Fixes readonly filesystem test cases
- Add `crictl.yaml` to install directory
- Fix build for ppc64
- Require golang >= 1.11
-------------------------------------------------------------------
Tue Nov 13 07:50:12 UTC 2018 - Valentin Rothberg <vrothberg@suse.com>
@ -50,12 +73,12 @@ Fri Jun 15 07:59:00 UTC 2018 - vrothberg@suse.com
-------------------------------------------------------------------
Tue Jun 5 08:28:14 UTC 2018 - dcassany@suse.com
- Refactor %license usage to a simpler form
- Refactor %license usage to a simpler form
-------------------------------------------------------------------
Mon Jun 4 14:50:13 UTC 2018 - dcassany@suse.com
- Make use of %license macro
- Make use of %license macro
-------------------------------------------------------------------
Mon Mar 5 13:22:07 UTC 2018 - vrothberg@suse.com

View File

@ -16,19 +16,21 @@
#
%define project github.com/kubernetes-sigs/cri-tools
%define project github.com/kubernetes-sigs/cri-tools
%define name_source1 crictl.yaml
Name: cri-tools
Version: 1.12.0
Version: 1.13.0
Release: 0
Summary: CLI and validation tools for Kubelet Container Runtime Interface
License: Apache-2.0
Group: System/Management
Url: https://github.com/kubernetes-sigs/cri-tools
Source0: %{name}-%{version}.tar.xz
Source1: crictl.yaml
Source1: %{name_source1}
BuildRequires: go-go-md2man
BuildRequires: golang-packaging
BuildRequires: golang(API) >= 1.10
BuildRequires: golang(API) >= 1.11
# disable stripping of binaries
%{go_nostrip}
@ -48,16 +50,23 @@ rm -rf $HOME/go/src/%{project}/*
cp -avr * $HOME/go/src/%{project}
cd $HOME/go/src/%{project}
go build -buildmode=pie \
export BUILDMODE_ARGS="-buildmode=pie"
# the buildmode pie is currently not supported for ppc64
if [ %{_arch} = "ppc64" ]; then
unset BUILDMODE_ARGS
fi
go build $BUILDMODE_ARGS \
-o bin/crictl \
-ldflags '-X %{project}/pkg/version.Version=%{version}' \
%{project}/cmd/crictl
go test -buildmode=pie \
go test $BUILDMODE_ARGS \
-o bin/critest \
-ldflags '-X %{project}/pkg/version.Version=%{version}' \
-c %{project}/cmd/critest
# compile the manpages
for md in docs/*.md
do
@ -77,12 +86,14 @@ install -D -m 0644 docs/crictl.1 %{buildroot}/%{_mandir}/man1/crictl.1
install -D -m 0644 docs/benchmark.1 %{buildroot}/%{_mandir}/man1/critest-benchmark.1
install -D -m 0644 docs/validation.1 %{buildroot}/%{_mandir}/man1/critest-validation.1
install -D -m 0644 crictl-completion %{buildroot}/%{_datadir}/bash-completion/completions/crictl
install -D -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/%{name_source1}
%files
%{_bindir}/crictl
%{_bindir}/critest
%{_mandir}/man1/*
%{_datadir}/bash-completion/completions/crictl
%config(noreplace) %{_sysconfdir}/%{name_source1}
%license LICENSE
%changelog

2
rpmlintrc Normal file
View File

@ -0,0 +1,2 @@
addFilter("unstripped-binary-or-object")
addFilter("no-version-in-last-changelog")