From c03e9e2eb1d8ff0fa740b33442739d1432315a07dc4c09f4c5a4b7518bce3ff1 Mon Sep 17 00:00:00 2001 From: Richard Brown Date: Mon, 13 Aug 2018 09:13:11 +0000 Subject: [PATCH] Accepting request 628890 from home:vrothberg:branches:devel:kubic - Generate and install bash completion for crictl. - Provide /etc/crictl.yaml config. bsc#1104598 OBS-URL: https://build.opensuse.org/request/show/628890 OBS-URL: https://build.opensuse.org/package/show/devel:kubic/cri-tools?expand=0&rev=2 --- cri-tools.changes | 8 ++++++++ cri-tools.spec | 6 ++++++ crictl.yaml | 1 + 3 files changed, 15 insertions(+) create mode 100644 crictl.yaml diff --git a/cri-tools.changes b/cri-tools.changes index 425d4e3..91ffcc1 100644 --- a/cri-tools.changes +++ b/cri-tools.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Aug 13 08:54:30 UTC 2018 - vrothberg@suse.com + +- Generate and install bash completion for crictl. + +- Provide /etc/crictl.yaml config. + bsc#1104598 + ------------------------------------------------------------------- Thu Aug 2 09:00:47 UTC 2018 - vrothberg@suse.com diff --git a/cri-tools.spec b/cri-tools.spec index 31d5abb..4c80d13 100644 --- a/cri-tools.spec +++ b/cri-tools.spec @@ -25,6 +25,7 @@ License: Apache-2.0 Group: System/Management Url: https://github.com/kubernetes-incubator/cri-tools Source0: %{name}-%{version}.tar.xz +Source1: crictl.yaml BuildRequires: go-go-md2man BuildRequires: golang-packaging BuildRequires: golang(API) >= 1.9 @@ -62,6 +63,9 @@ do done rename '.md' '.1' docs/* +# generate bash-completion +./bin/crictl completion > crictl-completion + %install cd $HOME/go/src/%{project} install -D -m 0755 bin/crictl %{buildroot}/%{_bindir}/crictl @@ -70,11 +74,13 @@ install -d %{buildroot}/%{_mandir}/man1 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 %files %{_bindir}/crictl %{_bindir}/critest %{_mandir}/man1/* +%{_datadir}/bash-completion/completions/crictl %license LICENSE %changelog diff --git a/crictl.yaml b/crictl.yaml new file mode 100644 index 0000000..5b589bf --- /dev/null +++ b/crictl.yaml @@ -0,0 +1 @@ +runtime-endpoint: unix:///var/run/crio/crio.sock