Skip to content

vendor: update github.com/containerd/nri@v0.4.0 #9088

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 2 commits into from
Sep 13, 2023
Merged

vendor: update github.com/containerd/nri@v0.4.0 #9088

merged 2 commits into from
Sep 13, 2023

Conversation

samuelkarp
Copy link
Member

This adds support for adding rlimits to containers through NRI.

@samuelkarp samuelkarp requested a review from klihub September 12, 2023 23:31
@samuelkarp
vendor: update github.com/containerd/nri@v0.4.0
6f9de91 
Signed-off-by: Samuel Karp <samuelkarp@google.com>
@samuelkarp
Copy link
Member Author

samuelkarp force-pushed the nri branch from 4c43a9f to 6f9de91

Helps to use the same version of Go that CI is using 😂

@samuelkarp
nri: update mock plugin handlers
9656b8c 
Signed-off-by: Samuel Karp <samuelkarp@google.com>
@thaJeztah
Copy link
Member

Curious where the "foo" cones from 🤔

time="2023-09-13T01:07:30Z" level=warning msg="Invalid SOURCE_DATE_EPOCH" error="invalid SOURCE_DATE_EPOCH value: invalid value: strconv.ParseInt: parsing \"foo\": invalid syntax"
    epoch_test.go:110: 
        	Error Trace:	D:/a/containerd/containerd/src/github.com/containerd/containerd/pkg/epoch/epoch_test.go:110
        	Error:      	Should be true
        	Test:       	TestSourceDateEpoch/WithInvalidSourceDateEpoch
        	Messages:   	now: 2023-09-13 01:07:30.1079008 +0000 UTC, v: 2023-09-13 01:07:30.2645118 +0000 UTC
 	})

@thaJeztah
Copy link
Member

oh, never mind; that's part of the test, but wondering why it didn't match the error

@samuelkarp
Copy link
Member Author

The failing line is

require.True(t, rightAfter(now, v), "now: %s, v: %s", now, v)

Maybe the timer resolution on Windows is a bit different from what we expect?

	threshold := 10 * time.Millisecond
	if runtime.GOOS == "windows" {
		// Low timer resolution on Windows
		threshold *= 10
	}
	return t2.After(t1) && t2.Before(t1.Add(threshold))

Either way it's unrelated to this vendor update.

@samuelkarp samuelkarp mentioned this pull request Sep 13, 2023
Closed
@samuelkarp
Copy link
Member Author

Opened #9090 for the test flake.

klihub
klihub approved these changes Sep 13, 2023
View reviewed changes
Copy link
Member

@klihub klihub left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@thaJeztah thaJeztah mentioned this pull request Sep 13, 2023
Merged
2 tasks
thaJeztah
thaJeztah approved these changes Sep 13, 2023
View reviewed changes
Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@estesp estesp merged commit 0f52935 into containerd:main Sep 13, 2023
@samuelkarp samuelkarp added the cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch label Sep 14, 2023
@samuelkarp samuelkarp mentioned this pull request Sep 14, 2023
Merged
@samuelkarp samuelkarp added cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch and removed cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch labels Sep 18, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@klihub klihub klihub approved these changes

@estesp estesp estesp approved these changes

@thaJeztah thaJeztah thaJeztah approved these changes

Assignees
No one assigned
Labels
cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@samuelkarp @thaJeztah @klihub @estesp