Update and vendor various dependencies prior to a new release #7526

kwilczynski · 2023-11-30T11:48:18Z

What type of PR is this?

/kind dependency-change
/assign kwilczynski

What this PR does / why we need it:

Update various direct build time dependencies prior to a new release. This change also closes several dependency changes that had been open for a while.

None

Special notes for your reviewer:

See review comments.

Does this PR introduce a user-facing change?

None

kwilczynski · 2023-11-30T11:49:14Z

go.mod

 	github.com/containerd/ttrpc v1.2.2
 	github.com/containerd/typeurl v1.0.3-0.20220422153119-7f6e6d160d67
 	github.com/containernetworking/cni v1.1.2
 	github.com/containernetworking/plugins v1.3.0
-	github.com/containers/common v0.55.4
+	github.com/containers/common v0.57.0


This change means that the following Pull Request is no longer needed:

[main] go get github.com/containers/common@v0.55.5-0.20231119144331-165b7a4dd43c #7496

kwilczynski · 2023-11-30T11:51:29Z

go.mod

-	github.com/checkpoint-restore/go-criu/v6 v6.3.0
-	github.com/container-orchestrated-devices/container-device-interface v0.6.0
+	github.com/checkpoint-restore/checkpointctl v1.1.0
+	github.com/checkpoint-restore/go-criu/v7 v7.0.0


This change follows the following upstream update:

vendor: update github.com/checkpoint-restore/checkpointctl to 1.1.0 containers/podman#19873

And, when included, would resolve the following build time error:

panic: proto: file "stats/stats.proto" is already registered previously from: "github.com/checkpoint-restore/go-criu/v6/stats" currently from: "github.com/checkpoint-restore/go-criu/v7/stats"

kwilczynski · 2023-11-30T11:53:09Z

go.mod

 	github.com/containers/conmon v2.0.20+incompatible
-	github.com/containers/conmon-rs v0.6.1
+	github.com/containers/conmon-rs v0.6.2-0.20230920142715-f5a362044a57


This change follows the following upstream change:

vendor of containers/common containers/conmon-rs#1713

And, when included, would resolve the following build time error:

# github.com/containers/conmon-rs/pkg/client vendor/github.com/containers/conmon-rs/pkg/client/attach.go:232:19: undefined: util.CopyDetachable vendor/github.com/containers/conmon-rs/pkg/client/attach.go:429:26: undefined: util.ErrDetach

To add:

This vendors a specific commit for the time being in anticipation of a future new release of conmon-rs.

kwilczynski · 2023-11-30T12:35:09Z

go.mod

@@ -7,29 +7,28 @@ require (
 	github.com/Microsoft/go-winio v0.6.1
 	github.com/blang/semver v3.5.1+incompatible
 	github.com/blang/semver/v4 v4.0.0
-	github.com/checkpoint-restore/checkpointctl v0.1.0
-	github.com/checkpoint-restore/go-criu/v6 v6.3.0
-	github.com/container-orchestrated-devices/container-device-interface v0.6.0


This change follows the following upstream update:

Use tags.cncf.io URL in module names cncf-tags/container-device-interface#172

And, when included, would resolve package import issues.

saschagrunert

The linter is not happy, though:

  Error: SA1019: otelgrpc.UnaryServerInterceptor is deprecated: Use [NewServerHandler] instead.  (staticcheck)
  Error: SA1019: otelgrpc.StreamServerInterceptor is deprecated: Use [NewServerHandler] instead.  (staticcheck)

kwilczynski · 2023-11-30T13:15:55Z

The linter is not happy, though:

  Error: SA1019: otelgrpc.UnaryServerInterceptor is deprecated: Use [NewServerHandler] instead.  (staticcheck)
  Error: SA1019: otelgrpc.StreamServerInterceptor is deprecated: Use [NewServerHandler] instead.  (staticcheck)

@saschagrunert, we can fix this later in a follow-up Pull Request.

This might be a larger body of work, and I don't want to mix dependency updates with code refactorings, if possible.

Unless you want this fixed here?

codecov · 2023-11-30T13:17:36Z

Codecov Report

Merging #7526 (1e15c38) into main (87c53ac) will decrease coverage by 0.01%.
Report is 2 commits behind head on main.
The diff coverage is n/a.

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #7526      +/-   ##
==========================================
- Coverage   48.69%   48.68%   -0.01%     
==========================================
  Files         145      145              
  Lines       15926    15926              
==========================================
- Hits         7755     7754       -1     
- Misses       7236     7237       +1     
  Partials      935      935

saschagrunert · 2023-11-30T13:19:10Z

@kwilczynski I'd prefer to fix it within this PR, you can just go for a second commit on top of the dependency changes.

kwilczynski · 2023-11-30T13:20:58Z

@kwilczynski I'd prefer to fix it within this PR, you can just go for a second commit on top of the dependency changes.

@saschagrunert, OK! Will do.

kwilczynski · 2023-12-04T10:21:01Z

@kwilczynski I'd prefer to fix it within this PR, you can just go for a second commit on top of the dependency changes.

@saschagrunert, OK! Will do.

Done. Completed in cc956e6.

kwilczynski · 2023-12-04T10:26:32Z

/assign hswong3i

openshift-ci · 2023-12-04T10:26:35Z

@kwilczynski: GitHub didn't allow me to assign the following users: hswong3i.

Note that only cri-o members with read permissions, repo collaborators and people who have commented on this issue/PR can be assigned. Additionally, issues/PRs can only have 10 assignees at the same time.
For more information please see the contributor guide

In response to this:

/assign hswong3i

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

klihub · 2023-12-04T16:55:59Z

/lgtm

klihub · 2023-12-04T16:57:29Z

/lgtm cancel

Signed-off-by: Krzysztof Wilczyński <kwilczynski@redhat.com>

Signed-off-by: Krisztian Litkey <krisztian.litkey@intel.com>

sohankunkerkar

/lgtm

openshift-ci · 2023-12-04T17:22:21Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kwilczynski, saschagrunert, sohankunkerkar

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [kwilczynski,saschagrunert,sohankunkerkar]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

haircommander · 2023-12-04T18:39:32Z

/override ci/prow/ci-e2e-conmonrs

openshift-ci · 2023-12-04T18:39:37Z

@haircommander: Overrode contexts on behalf of haircommander: ci/prow/ci-e2e-conmonrs

In response to this:

/override ci/prow/ci-e2e-conmonrs

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

haircommander · 2023-12-04T19:46:34Z

/retest

sohankunkerkar · 2023-12-05T04:53:22Z

/retest

kwilczynski requested a review from mrunalp as a code owner November 30, 2023 11:48

openshift-ci bot assigned kwilczynski Nov 30, 2023

openshift-ci bot added release-note-none Denotes a PR that doesn't merit a release note. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. labels Nov 30, 2023

openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 30, 2023

openshift-ci bot added the kind/dependency-change Categorizes issue or PR as related to changing dependencies label Nov 30, 2023

kwilczynski commented Nov 30, 2023

View reviewed changes

openshift-ci bot requested review from hasan4791 and klihub November 30, 2023 11:49

kwilczynski commented Nov 30, 2023

View reviewed changes

kwilczynski force-pushed the feature/update-various-dependencies branch from 92da412 to 3c7d125 Compare November 30, 2023 11:59

openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 30, 2023

kwilczynski force-pushed the feature/update-various-dependencies branch 2 times, most recently from 76db83b to 767f4ce Compare November 30, 2023 12:33

kwilczynski commented Nov 30, 2023

View reviewed changes

kwilczynski force-pushed the feature/update-various-dependencies branch 2 times, most recently from 4af7912 to 9a0b54c Compare November 30, 2023 12:45

saschagrunert reviewed Nov 30, 2023

View reviewed changes

kwilczynski force-pushed the feature/update-various-dependencies branch from 9a0b54c to d6ad94e Compare December 4, 2023 10:13

kwilczynski mentioned this pull request Dec 4, 2023

[main] go get github.com/containers/common@v0.55.5-0.20231119144331-165b7a4dd43c #7496

Closed

saschagrunert approved these changes Dec 4, 2023

View reviewed changes

openshift-ci bot assigned saschagrunert Dec 4, 2023

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 4, 2023

openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Dec 4, 2023

kwilczynski force-pushed the feature/update-various-dependencies branch 3 times, most recently from 5576df6 to 8dd33d4 Compare December 4, 2023 17:05

kwilczynski and others added 4 commits December 5, 2023 02:11

Update and vendor various dependencies prior to a new release

493dfea

Signed-off-by: Krzysztof Wilczyński <kwilczynski@redhat.com>

Update man pages following a urfave/cli package version upgrade

0dbe7b3

Signed-off-by: Krzysztof Wilczyński <kwilczynski@redhat.com>

Move to use stats handlers over deprecated interceptors

cc956e6

Signed-off-by: Krzysztof Wilczyński <kwilczynski@redhat.com>

test/nri: update tests for latest NRI.

1e15c38

Signed-off-by: Krisztian Litkey <krisztian.litkey@intel.com>

kwilczynski force-pushed the feature/update-various-dependencies branch from 8dd33d4 to 1e15c38 Compare December 4, 2023 17:13

sohankunkerkar approved these changes Dec 4, 2023

View reviewed changes

openshift-ci bot assigned sohankunkerkar Dec 4, 2023

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 4, 2023

openshift-merge-bot bot merged commit 2824bf9 into cri-o:main Dec 5, 2023
57 of 59 checks passed

kwilczynski deleted the feature/update-various-dependencies branch December 5, 2023 14:07

klihub mentioned this pull request Dec 7, 2023

go.mod: update CDI dependency to 0.6.2. #7466

Closed

hswong3i mentioned this pull request Dec 11, 2023

[v0.53.x][git cherry-pick 5c81adc] apparmor: fix parsing beta/alpha version containers/common#1746

Closed

elezar mentioned this pull request Jan 23, 2024

Bump clients to v0.6.2 cncf-tags/container-device-interface#176

Closed

10 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update and vendor various dependencies prior to a new release #7526

Update and vendor various dependencies prior to a new release #7526

kwilczynski commented Nov 30, 2023 •

edited

kwilczynski Nov 30, 2023

kwilczynski Nov 30, 2023

kwilczynski Nov 30, 2023

kwilczynski Nov 30, 2023 •

edited

kwilczynski Nov 30, 2023

saschagrunert left a comment

kwilczynski commented Nov 30, 2023

codecov bot commented Nov 30, 2023 •

edited

saschagrunert commented Nov 30, 2023

kwilczynski commented Nov 30, 2023

kwilczynski commented Dec 4, 2023 •

edited

kwilczynski commented Dec 4, 2023

openshift-ci bot commented Dec 4, 2023

klihub commented Dec 4, 2023

klihub commented Dec 4, 2023

sohankunkerkar left a comment

openshift-ci bot commented Dec 4, 2023

haircommander commented Dec 4, 2023

openshift-ci bot commented Dec 4, 2023

haircommander commented Dec 4, 2023

sohankunkerkar commented Dec 5, 2023

Update and vendor various dependencies prior to a new release #7526

Update and vendor various dependencies prior to a new release #7526

Conversation

kwilczynski commented Nov 30, 2023 • edited

What type of PR is this?

What this PR does / why we need it:

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

kwilczynski Nov 30, 2023

Choose a reason for hiding this comment

kwilczynski Nov 30, 2023

Choose a reason for hiding this comment

kwilczynski Nov 30, 2023

Choose a reason for hiding this comment

kwilczynski Nov 30, 2023 • edited

Choose a reason for hiding this comment

kwilczynski Nov 30, 2023

Choose a reason for hiding this comment

saschagrunert left a comment

Choose a reason for hiding this comment

kwilczynski commented Nov 30, 2023

codecov bot commented Nov 30, 2023 • edited

Codecov Report

saschagrunert commented Nov 30, 2023

kwilczynski commented Nov 30, 2023

kwilczynski commented Dec 4, 2023 • edited

kwilczynski commented Dec 4, 2023

openshift-ci bot commented Dec 4, 2023

klihub commented Dec 4, 2023

klihub commented Dec 4, 2023

sohankunkerkar left a comment

Choose a reason for hiding this comment

openshift-ci bot commented Dec 4, 2023

haircommander commented Dec 4, 2023

openshift-ci bot commented Dec 4, 2023

haircommander commented Dec 4, 2023

sohankunkerkar commented Dec 5, 2023

kwilczynski commented Nov 30, 2023 •

edited

kwilczynski Nov 30, 2023 •

edited

codecov bot commented Nov 30, 2023 •

edited

kwilczynski commented Dec 4, 2023 •

edited