Accepting request 1293450 from devel:kubic

- Update to version 1.33.0
- Avoid modifying permissions for man directory (forwarded request 1288807 from mchellamuthu)

OBS-URL: https://build.opensuse.org/request/show/1293450
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cri-tools?expand=0&rev=23

_service

@@ -1,15 +1,20 @@
 <services>
-  <service name="tar_scm" mode="disabled">
+  <service name="obs_scm" mode="manual">
     <param name="url">https://github.com/kubernetes-sigs/cri-tools.git</param>
     <param name="scm">git</param>
-    <param name="revision">v1.24.1</param>
+    <param name="revision">refs/tags/v1.33.0</param>
     <param name="versionformat">@PARENT_TAG@</param>
-    <param name="changesgenerate">enable</param>
     <param name="versionrewrite-pattern">v(.*)</param>
+    <param name="changesgenerate">enable</param>
   </service>
-  <service mode="disabled" name="set_version">
+  <service name="set_version" mode="manual">
   </service>
-  <service name="recompress" mode="disabled">
+  <service name="go_modules" mode="manual">
+  </service>
+  <!-- services below are running at buildtime -->
+  <service name="tar" mode="buildtime">
+  </service>
+  <service name="recompress" mode="buildtime">
     <param name="file">*.tar</param>
     <param name="compression">xz</param>
   </service>

_servicedata

@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/kubernetes-sigs/cri-tools.git</param>
-              <param name="changesrevision">d1d0120c55730038c65fa6baf98418b199f4b919</param></service></servicedata>
+              <param name="changesrevision">c677146127eec65369ae41fb556f7122f8308fd4</param></service></servicedata>

cri-tools-1.24.1.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:37bf7a2e0a6a026417dfa192f88802e594aa55ca23151ed2d413d591a72fbc0c
-size 3000928

cri-tools-1.33.0.obscpio

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

cri-tools.changes

@@ -1,3 +1,121 @@
+-------------------------------------------------------------------
+Sat Jun 07 11:55:14 UTC 2025 - Johannes Kastl <opensuse_buildservice@ojkastl.de>
+
+- Update to version 1.33.0:
+  https://github.com/kubernetes-sigs/cri-tools/releases/tag/v1.33.0
+  * Feature
+    - Add metricdescs subcommand for ListMetricDescriptors API (#1815, @bitoku)
+    - Added crictl update --oom-score-adj flag. (#1781, @saschagrunert)
+    - KEP-3619: "crictl info" now shows "RuntimeFeatures" object(in ".features" field) (#1772, @everpeace)
+    - crictl logs now is able to fetch a specific log stream of a container with the introducted --stream flag. (#1724, @knight42)
+  * Documentation
+    - Generated man files using go-md2man v2. (#1770, @saschagrunert)
+  * Bug or Regression
+    - Added --all flag to crictl inspect to allow listing exited containers.
+    - Fixed --image filter flag for crictl inspect and exec. (#1752, @saschagrunert)
+  * Dependencies added
+    - github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp: v1.26.0
+    - github.com/envoyproxy/go-control-plane/envoy: v1.32.4
+    - github.com/envoyproxy/go-control-plane/ratelimit: v0.1.0
+    - github.com/go-jose/go-jose/v4: v4.0.4
+    - github.com/klauspost/compress: v1.18.0
+    - github.com/kylelemons/godebug: v1.1.0
+    - github.com/prashantv/gostub: v1.1.0
+    - github.com/spiffe/go-spiffe/v2: v2.5.0
+    - github.com/zeebo/errs: v1.4.0
+    - go.opentelemetry.io/auto/sdk: v1.1.0
+    - go.opentelemetry.io/contrib/detectors/gcp: v1.34.0
+    - go.opentelemetry.io/otel/sdk/metric: v1.34.0
+    - go.uber.org/automaxprocs: v1.6.0
+    - sigs.k8s.io/randfill: v1.0.0
+  * Dependencies changed
+    - cel.dev/expr: v0.16.1 → v0.20.0
+    - cloud.google.com/go/compute/metadata: v0.5.0 → v0.6.0
+    - github.com/Azure/go-ansiterm: 306776e → faa5f7b
+    - github.com/cncf/xds/go: b4127c9 → 2f00578
+    - github.com/docker/docker: v27.3.1+incompatible → v28.1.1+incompatible
+    - github.com/envoyproxy/go-control-plane: v0.13.0 → v0.13.4
+    - github.com/envoyproxy/protoc-gen-validate: v1.1.0 → v1.2.1
+    - github.com/golang/glog: v1.2.2 → v1.2.4
+    - github.com/google/btree: v1.0.1 → v1.1.3
+    - github.com/google/gnostic-models: v0.6.8 → v0.6.9
+    - github.com/google/go-cmp: v0.6.0 → v0.7.0
+    - github.com/google/gofuzz: v1.2.0 → v1.0.0
+    - github.com/google/pprof: d1b30fe → 27863c8
+    - github.com/gorilla/websocket: v1.5.0 → e064f32
+    - github.com/grpc-ecosystem/grpc-gateway/v2: v2.23.0 → v2.26.1
+    - github.com/invopop/jsonschema: v0.12.0 → v0.13.0
+    - github.com/moby/term: v0.5.0 → v0.5.2
+    - github.com/onsi/ginkgo/v2: v2.22.0 → v2.23.4
+    - github.com/onsi/gomega: v1.36.0 → v1.37.0
+    - github.com/opencontainers/selinux: v1.11.1 → v1.12.0
+    - github.com/pmezard/go-difflib: 5d4384e → v1.0.0
+    - github.com/prometheus/client_golang: v1.19.1 → v1.22.0-rc.0
+    - github.com/prometheus/common: v0.55.0 → v0.62.0
+    - github.com/stretchr/objx: v0.1.0 → v0.5.2
+    - github.com/stretchr/testify: v1.9.0 → v1.10.0
+    - github.com/urfave/cli/v2: v2.27.5 → v2.27.6
+    - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc: v0.53.0 → v0.58.0
+    - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp: v0.53.0 → v0.58.0
+    - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc: v1.32.0 → v1.35.0
+    - go.opentelemetry.io/otel/exporters/otlp/otlptrace: v1.32.0 → v1.35.0
+    - go.opentelemetry.io/otel/metric: v1.32.0 → v1.35.0
+    - go.opentelemetry.io/otel/sdk: v1.32.0 → v1.35.0
+    - go.opentelemetry.io/otel/trace: v1.32.0 → v1.35.0
+    - go.opentelemetry.io/otel: v1.32.0 → v1.35.0
+    - go.opentelemetry.io/proto/otlp: v1.3.1 → v1.5.0
+    - golang.org/x/crypto: v0.28.0 → v0.36.0
+    - golang.org/x/mod: v0.21.0 → v0.24.0
+    - golang.org/x/net: v0.30.0 → v0.38.0
+    - golang.org/x/oauth2: v0.23.0 → v0.27.0
+    - golang.org/x/sync: v0.10.0 → v0.13.0
+    - golang.org/x/sys: v0.28.0 → v0.32.0
+    - golang.org/x/term: v0.27.0 → v0.31.0
+    - golang.org/x/text: v0.21.0 → v0.24.0
+    - golang.org/x/time: v0.7.0 → v0.9.0
+    - golang.org/x/tools: v0.26.0 → v0.31.0
+    - google.golang.org/genproto/googleapis/api: dd2ea8e → 56aae31
+    - google.golang.org/genproto/googleapis/rpc: dd2ea8e → 56aae31
+    - google.golang.org/grpc: v1.68.1 → v1.72.0
+    - google.golang.org/protobuf: v1.35.2 → v1.36.6
+    - k8s.io/api: v0.32.0-rc.2 → v0.33.0-rc.0
+    - k8s.io/apimachinery: v0.32.0-rc.2 → v0.33.0-rc.0
+    - k8s.io/apiserver: v0.32.0-rc.2 → v0.33.0-rc.0
+    - k8s.io/cli-runtime: v0.32.0-rc.2 → v0.33.0-rc.0
+    - k8s.io/client-go: v0.32.0-rc.2 → v0.33.0-rc.0
+    - k8s.io/component-base: v0.32.0-rc.2 → v0.33.0-rc.0
+    - k8s.io/component-helpers: v0.32.0-rc.2 → v0.33.0-rc.0
+    - k8s.io/cri-api: v0.32.0-rc.2 → v0.33.0-rc.0
+    - k8s.io/cri-client: v0.32.0-rc.2 → v0.33.0-rc.0
+    - k8s.io/kube-openapi: 32ad38e → c8a335a
+    - k8s.io/kubectl: v0.32.0-rc.2 → v0.33.0-rc.0
+    - k8s.io/kubelet: v0.32.0-rc.2 → v0.33.0-rc.0
+    - k8s.io/metrics: v0.32.0-rc.2 → v0.33.0-rc.0
+    - sigs.k8s.io/kustomize/api: v0.18.0 → v0.19.0
+    - sigs.k8s.io/kustomize/kustomize/v5: v5.5.0 → v5.6.0
+    - sigs.k8s.io/kustomize/kyaml: v0.18.1 → v0.19.0
+    - sigs.k8s.io/structured-merge-diff/v4: v4.4.2 → v4.6.0
+  * Dependencies removed
+    - github.com/census-instrumentation/opencensus-proto: v0.4.1
+    - github.com/go-kit/log: v0.2.1
+    - github.com/go-logfmt/logfmt: v0.5.1
+    - google.golang.org/appengine: v1.6.7
+- refactor '_service' file to use obs_scm
+- refactor spec file
+
+-------------------------------------------------------------------
+Fri Feb 28 13:28:57 UTC 2025 - Priyanka Saggu <priyanka.saggu@suse.com>
+
+- Update to version 1.32.0:
+  * Ref for changelog: https://github.com/kubernetes-sigs/cri-tools/releases/tag/v1.32.0
+
+- update: `%define project sigs.k8s.io/cri-tools`
+
+- bump: `BuildRequires:  golang(API) >= 1.24`
+
+- update _service file to add `go_modules` service to generate the `vendor.tar.gz`
+  * update .spec file to add the vendor tarball as source
+
 -------------------------------------------------------------------
 Thu May 19 23:57:55 UTC 2022 - jkowalczyk@suse.com
 

cri-tools.obsinfo

@@ -0,0 +1,4 @@
+name: cri-tools
+version: 1.33.0
+mtime: 1745307703
+commit: c677146127eec65369ae41fb556f7122f8308fd4

cri-tools.spec

@@ -15,95 +15,76 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
-%define project         github.com/kubernetes-sigs/cri-tools
-%define name_source1    crictl.yaml
+%define executable_name crictl
 
 Name:           cri-tools
-Version:        1.24.1
+Version:        1.33.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:        %{name_source1}
+Source1:        vendor.tar.gz
 Source2:        rpmlintrc
+Source11:       crictl.yaml
 BuildRequires:  go-go-md2man
-BuildRequires:  golang-packaging
-BuildRequires:  golang(API) >= 1.17
-# disable stripping of binaries
-%{go_nostrip}
+BuildRequires:  golang(API) >= 1.24
+BuildRequires:  bash-completion
+BuildRequires:  fish
+BuildRequires:  zsh
 
 %description
 cri-tools provides a series of debugging and validation tools for
 Kubelet CRI, which includes:
+
 - crictl: CLI for kubelet CRI
 - critest: validation test suites for kubelet CRI
 
 %prep
-%setup -q
+%autosetup -a 1
 
 %build
-export GOPATH=$HOME/go
-mkdir -pv $HOME/go/src/%{project}
-rm -rf $HOME/go/src/%{project}/*
-cp -avr * $HOME/go/src/%{project}
-cd $HOME/go/src/%{project}
+%ifnarch ppc64
+export GOFLAGS="-buildmode=pie"
+%endif
+go build -o bin/%{executable_name} ./cmd/%{executable_name}
+go test -o bin/critest -c ./cmd/critest
 
-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 \
-         -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
-	go-md2man -in $md -out $md
-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 fish > crictl.fish
+# compile the manpage
+go-md2man -in docs/%{executable_name}.md -out docs/%{executable_name}.1
 
 %install
-cd $HOME/go/src/%{project}
-install -D -m 0755 bin/crictl %{buildroot}/%{_bindir}/crictl
+install -D -m 0755 bin/%{executable_name} %{buildroot}/%{_bindir}/%{executable_name}
 install -D -m 0755 bin/critest %{buildroot}/%{_bindir}/critest
+
+# create the bash completion file
+mkdir -p %{buildroot}%{_datarootdir}/bash-completion/completions/
+%{buildroot}/%{_bindir}/%{executable_name} completion bash > %{buildroot}%{_datarootdir}/bash-completion/completions/%{executable_name}
+
+# create the fish completion file
+mkdir -p %{buildroot}%{_datarootdir}/fish/vendor_completions.d/
+%{buildroot}/%{_bindir}/%{executable_name} completion fish > %{buildroot}%{_datarootdir}/fish/vendor_completions.d/%{executable_name}.fish
+
+# create the zsh completion file
+mkdir -p %{buildroot}%{_datarootdir}/zsh/site-functions/
+%{buildroot}/%{_bindir}/%{executable_name} completion zsh > %{buildroot}%{_datarootdir}/zsh/site-functions/_%{executable_name}
+
 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-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}
+install -D -m 0644 docs/%{executable_name}.1 %{buildroot}/%{_mandir}/man1/
+install -D -m 0644 %{SOURCE11} %{buildroot}/%{_sysconfdir}/crictl.yaml
 
 %files
-%{_bindir}/crictl
-%{_bindir}/critest
-%{_mandir}/man1/*
-%{_datadir}/bash-completion/completions/crictl
-%{_datadir}/zsh
-%{_datadir}/fish
-%{_datadir}/fish/completions
-%{_datadir}/fish/completions/crictl.fish
-%config(noreplace) %{_sysconfdir}/%{name_source1}
+%doc README.md
 %license LICENSE
+%{_bindir}/%{executable_name}
+%{_bindir}/critest
+%config(noreplace) %{_sysconfdir}/crictl.yaml
+
+%{_mandir}/man1/*
+
+%{_datarootdir}/bash-completion/completions/%{executable_name}
+%{_datarootdir}/fish/vendor_completions.d/%{executable_name}.fish
+%{_datarootdir}/zsh/site-functions/_%{executable_name}
 
 %changelog

vendor.tar.gz

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