From e7caf0b28bd00be3d4df90930abef8e2843acd490a03ab0c0798deda7ebc2a06 Mon Sep 17 00:00:00 2001 From: Richard Brown Date: Wed, 1 Apr 2020 12:21:07 +0000 Subject: [PATCH 1/2] Accepting request 790568 from home:sgrunert - Update to v1.18.0: * Main Changes * Update Kubernetes to v1.18.0 * Switch to urfave/cli/v2 * CRI CLI (crictl) * Use ContextDialer to fix build * Add go-template option for inspect commands * Fix invalid log_path in docs * CRI validation testing (critest) * Make apparmor failure test more flexible * Start container before fetching metrics * Cleanup container create test to reduce duplication * Add container stats test OBS-URL: https://build.opensuse.org/request/show/790568 OBS-URL: https://build.opensuse.org/package/show/devel:kubic/cri-tools?expand=0&rev=12 --- _service | 4 ++-- cri-tools-1.17.0.tar.xz | 3 --- cri-tools-1.18.0.tar.xz | 3 +++ cri-tools.changes | 17 +++++++++++++++++ cri-tools.spec | 4 ++-- 5 files changed, 24 insertions(+), 7 deletions(-) delete mode 100644 cri-tools-1.17.0.tar.xz create mode 100644 cri-tools-1.18.0.tar.xz diff --git a/_service b/_service index 28073ab..afc6ca6 100644 --- a/_service +++ b/_service @@ -4,8 +4,8 @@ https://github.com/kubernetes-sigs/cri-tools.git git cri-tools -1.17.0 -v1.17.0 +1.18.0 +v1.18.0 diff --git a/cri-tools-1.17.0.tar.xz b/cri-tools-1.17.0.tar.xz deleted file mode 100644 index 0e607b7..0000000 --- a/cri-tools-1.17.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bc68c69266d7afa60000082d9d8b99673bb7a978698077572325bd38fcc71c49 -size 2382216 diff --git a/cri-tools-1.18.0.tar.xz b/cri-tools-1.18.0.tar.xz new file mode 100644 index 0000000..2267dba --- /dev/null +++ b/cri-tools-1.18.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:53b8cf93bda94b00104f74336cb2614af7efd05467f084aaef164ea21f02e383 +size 2423500 diff --git a/cri-tools.changes b/cri-tools.changes index e297c7b..59976ec 100644 --- a/cri-tools.changes +++ b/cri-tools.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Wed Apr 1 08:03:55 UTC 2020 - Sascha Grunert + +- Update to v1.18.0: + * Main Changes + * Update Kubernetes to v1.18.0 + * Switch to urfave/cli/v2 + * CRI CLI (crictl) + * Use ContextDialer to fix build + * Add go-template option for inspect commands + * Fix invalid log_path in docs + * CRI validation testing (critest) + * Make apparmor failure test more flexible + * Start container before fetching metrics + * Cleanup container create test to reduce duplication + * Add container stats test + ------------------------------------------------------------------- Mon Dec 16 08:46:22 UTC 2019 - Sascha Grunert diff --git a/cri-tools.spec b/cri-tools.spec index dca3448..0cc2112 100644 --- a/cri-tools.spec +++ b/cri-tools.spec @@ -20,7 +20,7 @@ %define name_source1 crictl.yaml Name: cri-tools -Version: 1.17.0 +Version: 1.18.0 Release: 0 Summary: CLI and validation tools for Kubelet Container Runtime Interface License: Apache-2.0 @@ -31,7 +31,7 @@ Source1: %{name_source1} Source2: rpmlintrc BuildRequires: go-go-md2man BuildRequires: golang-packaging -BuildRequires: golang(API) >= 1.12 +BuildRequires: golang(API) >= 1.13 # disable stripping of binaries %{go_nostrip} From 654d9a23c5b149d59caff3baa881e64c48d93c02d6ce2ecc18ae938ce19ad87f Mon Sep 17 00:00:00 2001 From: Richard Brown Date: Wed, 1 Apr 2020 15:11:59 +0000 Subject: [PATCH 2/2] Accepting request 790589 from home:sgrunert Fix build and add fish shell completion OBS-URL: https://build.opensuse.org/request/show/790589 OBS-URL: https://build.opensuse.org/package/show/devel:kubic/cri-tools?expand=0&rev=13 --- cri-tools.spec | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/cri-tools.spec b/cri-tools.spec index 0cc2112..eb40ba5 100644 --- a/cri-tools.spec +++ b/cri-tools.spec @@ -31,7 +31,7 @@ Source1: %{name_source1} Source2: rpmlintrc BuildRequires: go-go-md2man BuildRequires: golang-packaging -BuildRequires: golang(API) >= 1.13 +BuildRequires: golang(API) >= 1.14 # disable stripping of binaries %{go_nostrip} @@ -59,15 +59,16 @@ fi go build $BUILDMODE_ARGS \ -o bin/crictl \ + -mod vendor \ -ldflags '-X %{project}/pkg/version.Version=%{version}' \ %{project}/cmd/crictl go test $BUILDMODE_ARGS \ -o bin/critest \ + -mod vendor \ -ldflags '-X %{project}/pkg/version.Version=%{version}' \ -c %{project}/cmd/critest - # compile the manpages for md in docs/*.md do @@ -76,8 +77,9 @@ done rename '.md' '.1' docs/* # generate auto-completions -./bin/crictl completion bash > crictl-completion-bash -./bin/crictl completion zsh > crictl-completion-zsh +bin/crictl completion bash > crictl-completion-bash +bin/crictl completion zsh > crictl-completion-zsh +bin/crictl completion fish > crictl.fish %install cd $HOME/go/src/%{project} @@ -89,6 +91,7 @@ install -D -m 0644 docs/benchmark.1 %{buildroot}/%{_mandir}/man1/critest-benchma install -D -m 0644 docs/validation.1 %{buildroot}/%{_mandir}/man1/critest-validation.1 install -D -m 0644 crictl-completion-bash %{buildroot}/%{_datadir}/bash-completion/completions/crictl install -D -m 0644 crictl-completion-zsh %{buildroot}/%{_datadir}/zsh/site-functions/_crictl +install -D -m 0644 crictl.fish %{buildroot}/%{_datadir}/fish/completions/crictl.fish install -D -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/%{name_source1} %files @@ -97,6 +100,9 @@ install -D -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/%{name_source1} %{_mandir}/man1/* %{_datadir}/bash-completion/completions/crictl %{_datadir}/zsh +%{_datadir}/fish +%{_datadir}/fish/completions +%{_datadir}/fish/completions/crictl.fish %config(noreplace) %{_sysconfdir}/%{name_source1} %license LICENSE