Skip to content

go.mod: github.com/containerd/cgroups v1.0.0#5362

Closed
thaJeztah wants to merge 3 commits intocontainerd:masterfrom
thaJeztah:update_cgroups
Closed

go.mod: github.com/containerd/cgroups v1.0.0#5362
thaJeztah wants to merge 3 commits intocontainerd:masterfrom
thaJeztah:update_cgroups

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah commented Apr 14, 2021 •
edited
Loading

Opening, in case we need the fix from containerd/cgroups#192

Two extra commits were added to help the renaming of readme.md to README.md (done in cilium/ebpf@98e04fb / cilium/ebpf@b48cbe8 / cilium/ebpf#185)

full diff: containerd/cgroups@8a68de5...v1.0.0

@thaJeztah thaJeztah mentioned this pull request Apr 14, 2021
Closed
14 tasks
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Apr 14, 2021

Build succeeded.

@thaJeztah thaJeztah closed this Apr 14, 2021
@thaJeztah thaJeztah reopened this Apr 14, 2021
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Apr 14, 2021

Build succeeded.

@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Apr 14, 2021

Issues with gcr.io again?

file="/home/runner/work/containerd/containerd/src/github.com/containerd/containerd/remotes/docker/resolver.go:546" host=mirror.gcr.io response.header.accept-ranges=none response.header.alt-svc="h3-29=\":443\"; ma=2592000,h3-T051=\":443\"; ma=2592000,h3-Q050=\":443\"; ma=2592000,h3-Q046=\":443\"; ma=2592000,h3-Q043=\":443\"; ma=2592000,quic=\":443\"; ma=2592000; v=\"46,43\"" response.header.cache-control=private response.header.content-type=application/json response.header.date="Wed, 14 Apr 2021 20:24:26 GMT" response.header.docker-distribution-api-version=registry/2.0 response.header.server="Docker Registry" response.header.vary=Accept-Encoding response.header.x-frame-options=SAMEORIGIN response.header.x-xss-protection=0 response.status="404 Not Found" url="https://mirror.gcr.io/v2/library/alpine/manifests/latest"

@mikebrow
Copy link
Copy Markdown
Member

mikebrow commented Apr 14, 2021

yup

mike@mike-VirtualBox:/etc/containerd$ curl -s https://mirror.gcr.io//v2/library/alpine/tags/list | jq '[.tags ]'
[
  [
    "2.6",
    "20200428",
    "3.12.0",
    "3.12.1",
    "3.13.4",
    "3.3",
    "3.4",
    "3.5",
    "3.6",
    "3.7",
    "3.8",
    "3.9",
    "edge"
  ]
]

@AkihiroSuda
Copy link
Copy Markdown
Member

AkihiroSuda commented Apr 19, 2021

Could you use https://github.com/containerd/cgroups/releases/tag/v1.0.0 ?

@thaJeztah thaJeztah changed the title go.mod: github.com/containerd/cgroups v0.0.0-20210414185036-21be17332467 go.mod: github.com/containerd/cgroups v1.0.0 Apr 19, 2021
@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Apr 19, 2021

@AkihiroSuda updated 👍

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Apr 19, 2021

Build succeeded.

@fuweid
Copy link
Copy Markdown
Member

fuweid commented Apr 19, 2021

failed case 
2021-04-19T07:32:44.7860539Z     testsuite.go:119: Cleanup failed: unknown
2021-04-19T07:32:44.7861742Z         github.com/containerd/containerd/errdefs.init
2021-04-19T07:32:44.7863558Z         	/home/runner/work/containerd/containerd/src/github.com/containerd/containerd/errdefs/errors.go:43
2021-04-19T07:32:44.7864416Z         runtime.doInit
2021-04-19T07:32:44.7865316Z         	/opt/hostedtoolcache/go/1.15.11/x64/src/runtime/proc.go:5652
2021-04-19T07:32:44.7865875Z         runtime.doInit
2021-04-19T07:32:44.7866575Z         	/opt/hostedtoolcache/go/1.15.11/x64/src/runtime/proc.go:5647
2021-04-19T07:32:44.7867026Z         runtime.doInit
2021-04-19T07:32:44.7867528Z         	/opt/hostedtoolcache/go/1.15.11/x64/src/runtime/proc.go:5647
2021-04-19T07:32:44.7867974Z         runtime.doInit
2021-04-19T07:32:44.7868476Z         	/opt/hostedtoolcache/go/1.15.11/x64/src/runtime/proc.go:5647
2021-04-19T07:32:44.7868928Z         runtime.doInit
2021-04-19T07:32:44.7869424Z         	/opt/hostedtoolcache/go/1.15.11/x64/src/runtime/proc.go:5647
2021-04-19T07:32:44.7869871Z         runtime.doInit
2021-04-19T07:32:44.7870351Z         	/opt/hostedtoolcache/go/1.15.11/x64/src/runtime/proc.go:5647
2021-04-19T07:32:44.7870801Z         runtime.main
2021-04-19T07:32:44.7873352Z         	/opt/hostedtoolcache/go/1.15.11/x64/src/runtime/proc.go:191
2021-04-19T07:32:44.7874015Z         runtime.goexit
2021-04-19T07:32:44.7874663Z         	/opt/hostedtoolcache/go/1.15.11/x64/src/runtime/asm_amd64.s:1374
2021-04-19T07:32:44.7877753Z         unlinkat /var/lib/containerd-test/io.containerd.content.v1.content/ingest/9101c5f249b4cb38a50dddda86a787c09f31099573c87c525fc50774ac21d05d: directory not empty
2021-04-19T07:32:44.7880942Z         github.com/containerd/containerd/errdefs.FromGRPC
2021-04-19T07:32:44.7881844Z         	/home/runner/work/containerd/containerd/src/github.com/containerd/containerd/errdefs/grpc.go:107
2021-04-19T07:32:44.7882878Z         github.com/containerd/containerd/content/proxy.(*proxyContentStore).Abort
2021-04-19T07:32:44.7884160Z         	/home/runner/work/containerd/containerd/src/github.com/containerd/containerd/content/proxy/content_store.go:187
2021-04-19T07:32:44.7885138Z         github.com/containerd/containerd/integration/client.newContentStore.func2
2021-04-19T07:32:44.7886350Z         	/home/runner/work/containerd/containerd/src/github.com/containerd/containerd/integration/client/content_test.go:61
2021-04-19T07:32:44.7887282Z         github.com/containerd/containerd/content/testsuite.makeTest.func1.1
2021-04-19T07:32:44.7889342Z         	/home/runner/work/containerd/containerd/src/github.com/containerd/containerd/content/testsuite/testsuite.go:118
2021-04-19T07:32:44.7891045Z         github.com/containerd/containerd/content/testsuite.makeTest.func1
2021-04-19T07:32:44.7892501Z         	/home/runner/work/containerd/containerd/src/github.com/containerd/containerd/content/testsuite/testsuite.go:139

We use go1.16.2 but got go1.15.11...

@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Apr 19, 2021

We use go1.16.2 but got go1.15.11...

Hmmm... could that be another case where we use sudo, and env-vars are not persisted? moby/term#22 (comment)

@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Apr 19, 2021

I rebased / updated #4741; we could cherry-pick that to the 1.4 branch, or I can create an equivalent version for 1.4

@thaJeztah thaJeztah mentioned this pull request Apr 19, 2021
Merged
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Apr 19, 2021

Build succeeded.

@thaJeztah
Temporarily rename cilium/ebpf/readme.md for case-only name change
024e0be 
The project is renaming their readme.md to README.md, which doesn't play
well with git (by default) ignoring case on case-insensitive filesystems.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
Rename temporary cilium/ebpf readme to README.md
b4380c7 
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
go.mod: github.com/containerd/cgroups v1.0.0
5228686 
full diff: containerd/cgroups@8a68de5...v1.0.0

- v2: ebpf: replace deprecated prog.Attach/prog.Detach and fix closer
- go.mod: github.com/cilium/ebpf v0.4.0 (cilium/ebpf@v0.2.0...v0.4.0)
- go.mod: github.com/stretchr/testify v1.6.1 (same version as we already vendor)

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Apr 19, 2021

Build succeeded.

estesp
estesp approved these changes Apr 19, 2021
View reviewed changes
Copy link
Copy Markdown
Member

@estesp estesp 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 closed this Apr 19, 2021
@thaJeztah thaJeztah reopened this Apr 19, 2021
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Apr 19, 2021

Build succeeded.

@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Apr 19, 2021

👍 this one's green now

@dmcgowan
Copy link
Copy Markdown
Member

dmcgowan commented Apr 19, 2021

Closing this for #5393 which updates this along with remaining containerd repos

@dmcgowan dmcgowan closed this Apr 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@estesp estesp estesp approved these changes

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@thaJeztah @mikebrow @AkihiroSuda @fuweid @dmcgowan @estesp