Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 41d2e1e

Browse filesBrowse files
author
shucheng
committed
Merge tag 'v1.6.15' into main
containerd 1.6.15 Welcome to the v1.6.15 release of containerd! The fifteenth patch release for containerd 1.6 fixes an issue with CNI in the CRI plugin * **Fix no CNI info for pod sandbox on restart in CRI plugin** ([#7848](containerd/containerd#7848)) See the changelog for complete list of changes Please try out the release binaries and report any issues at https://github.com/containerd/containerd/issues. * Derek McGowan * Akihiro Suda * Danny Canter * Kevin Parsons * Samuel Karp * Wei Fu <details><summary>8 commits</summary> <p> * [release/1.6] Prepare release notes for v1.6.15 ([#7924](containerd/containerd#7924)) * [`883899eae`](containerd/containerd@883899e) Prepare release notes for v1.6.15 * [release/1.6] CI: Pass GITHUB_TOKEN to containerd/project-checks ([#7919](containerd/containerd#7919)) * [`b57367020`](containerd/containerd@b573670) CI: Pass GITHUB_TOKEN to containerd/project-checks * [release/1.6] integration/images: switch away from Docker Hub to avoid rate limit ([#7900](containerd/containerd#7900)) * [`0f4062c9b`](containerd/containerd@0f4062c) integration/images: switch away from Docker Hub to avoid rate limit * [release/1.6] CRI: Fix no CNI info for pod sandbox on restart ([#7848](containerd/containerd#7848)) * [`f16447e2d`](containerd/containerd@f16447e) CRI: Fix no CNI info for pod sandbox on restart </p> </details> This release has no dependency changes Previous release can be found at [v1.6.14](https://github.com/containerd/containerd/releases/tag/v1.6.14)
2 parents 1e922e3 + 5b842e5 commit 41d2e1e
Copy full SHA for 41d2e1e

63 files changed

+853-190Lines changed: 853 additions & 190 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎.github/workflows/build-test-images.yml‎

Copy file name to clipboardExpand all lines: .github/workflows/build-test-images.yml
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ jobs:
3737
working-directory: src/github.com/containerd/containerd
3838

3939
steps:
40-
- uses: actions/setup-go@v2
40+
- uses: actions/setup-go@v3
4141
with:
42-
go-version: '1.18.7'
42+
go-version: '1.18.9'
4343

44-
- uses: actions/checkout@v2
44+
- uses: actions/checkout@v3
4545
with:
4646
path: src/github.com/containerd/containerd
4747

Collapse file

‎.github/workflows/ci.yml‎

Copy file name to clipboardExpand all lines: .github/workflows/ci.yml
+69-57Lines changed: 69 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ on:
99
- main
1010
- 'release/**'
1111

12+
env:
13+
# Go version we currently use to build containerd across all CI.
14+
# Note: don't forget to update `Binaries` step, as it contains the matrix of all supported Go versions.
15+
GO_VERSION: '1.18.9'
16+
1217
jobs:
1318
#
1419
# golangci-lint
@@ -20,15 +25,20 @@ jobs:
2025

2126
strategy:
2227
matrix:
23-
go-version: [1.18.7]
24-
os: [ubuntu-18.04, macos-12, windows-2019]
28+
os: [ubuntu-20.04, macos-12, windows-2019]
2529

2630
steps:
27-
- uses: actions/setup-go@v2
31+
- name: Install dependencies
32+
if: matrix.os == 'ubuntu-20.04'
33+
run: |
34+
sudo apt-get update
35+
sudo apt-get install -y libbtrfs-dev
36+
37+
- uses: actions/setup-go@v3
2838
with:
29-
go-version: ${{ matrix.go-version }}
39+
go-version: ${{ env.GO_VERSION }}
3040

31-
- uses: actions/checkout@v2
41+
- uses: actions/checkout@v3
3242
- uses: golangci/golangci-lint-action@v3
3343
with:
3444
version: v1.49.0
@@ -40,22 +50,23 @@ jobs:
4050
#
4151
project:
4252
name: Project Checks
43-
runs-on: ubuntu-18.04
53+
runs-on: ubuntu-20.04
4454
timeout-minutes: 5
4555

4656
steps:
47-
- uses: actions/setup-go@v2
57+
- uses: actions/setup-go@v3
4858
with:
49-
go-version: '1.18.7'
59+
go-version: ${{ env.GO_VERSION }}
5060

51-
- uses: actions/checkout@v2
61+
- uses: actions/checkout@v3
5262
with:
5363
path: src/github.com/containerd/containerd
5464
fetch-depth: 100
5565

56-
- uses: containerd/project-checks@v1
66+
- uses: containerd/project-checks@v1.1.0
5767
with:
5868
working-directory: src/github.com/containerd/containerd
69+
repo-access-token: ${{ secrets.GITHUB_TOKEN }}
5970

6071
- name: verify go modules and vendor directory
6172
run: |
@@ -68,19 +79,19 @@ jobs:
6879
#
6980
protos:
7081
name: Protobuf
71-
runs-on: ubuntu-18.04
82+
runs-on: ubuntu-20.04
7283
timeout-minutes: 5
7384

7485
defaults:
7586
run:
7687
working-directory: src/github.com/containerd/containerd
7788

7889
steps:
79-
- uses: actions/setup-go@v2
90+
- uses: actions/setup-go@v3
8091
with:
81-
go-version: '1.18.7'
92+
go-version: ${{ env.GO_VERSION }}
8293

83-
- uses: actions/checkout@v2
94+
- uses: actions/checkout@v3
8495
with:
8596
path: src/github.com/containerd/containerd
8697

@@ -104,14 +115,14 @@ jobs:
104115

105116
man:
106117
name: Manpages
107-
runs-on: ubuntu-18.04
118+
runs-on: ubuntu-20.04
108119
timeout-minutes: 5
109120

110121
steps:
111-
- uses: actions/setup-go@v2
122+
- uses: actions/setup-go@v3
112123
with:
113-
go-version: '1.18.7'
114-
- uses: actions/checkout@v2
124+
go-version: ${{ env.GO_VERSION }}
125+
- uses: actions/checkout@v3
115126
- run: go install github.com/cpuguy83/go-md2man/v2@v2.0.1
116127
- run: make man
117128

@@ -146,10 +157,10 @@ jobs:
146157
goarm: "7"
147158

148159
steps:
149-
- uses: actions/setup-go@v2
160+
- uses: actions/setup-go@v3
150161
with:
151-
go-version: '1.18.7'
152-
- uses: actions/checkout@v2
162+
go-version: ${{ env.GO_VERSION }}
163+
- uses: actions/checkout@v3
153164
- run: |
154165
set -e -x
155166
@@ -214,11 +225,16 @@ jobs:
214225

215226
strategy:
216227
matrix:
217-
os: [ubuntu-18.04, macos-12, windows-2019, windows-2022]
218-
go-version: ['1.17.13', '1.18.7']
219-
228+
os: [ubuntu-20.04, macos-12, windows-2019, windows-2022]
229+
go-version: ["1.17.13", "1.18.9"]
220230
steps:
221-
- uses: actions/setup-go@v2
231+
- name: Install dependencies
232+
if: matrix.os == 'ubuntu-20.04'
233+
run: |
234+
sudo apt-get update
235+
sudo apt-get install -y libbtrfs-dev
236+
237+
- uses: actions/setup-go@v3
222238
with:
223239
go-version: ${{ matrix.go-version }}
224240

@@ -228,7 +244,7 @@ jobs:
228244
echo "GOPATH=${{ github.workspace }}" >> $GITHUB_ENV
229245
echo "${{ github.workspace }}/bin" >> $GITHUB_PATH
230246
231-
- uses: actions/checkout@v2
247+
- uses: actions/checkout@v3
232248
with:
233249
path: src/github.com/containerd/containerd
234250

@@ -260,15 +276,15 @@ jobs:
260276
working-directory: src/github.com/containerd/containerd
261277

262278
steps:
263-
- uses: actions/setup-go@v2
279+
- uses: actions/setup-go@v3
264280
with:
265-
go-version: '1.18.7'
281+
go-version: ${{ env.GO_VERSION }}
266282

267-
- uses: actions/checkout@v2
283+
- uses: actions/checkout@v3
268284
with:
269285
path: src/github.com/containerd/containerd
270286

271-
- uses: actions/checkout@v2
287+
- uses: actions/checkout@v3
272288
with:
273289
repository: Microsoft/hcsshim
274290
path: src/github.com/Microsoft/hcsshim
@@ -323,7 +339,7 @@ jobs:
323339
CGO_ENABLED: 1
324340
GOTESTSUM_JUNITFILE: ${{github.workspace}}/test-integration-parallel-junit.xml
325341
run: mingw32-make.exe integration
326-
- uses: actions/upload-artifact@v2
342+
- uses: actions/upload-artifact@v3
327343
if: always()
328344
with:
329345
name: TestResults Windows
@@ -332,7 +348,7 @@ jobs:
332348
333349
integration-linux:
334350
name: Linux Integration
335-
runs-on: ubuntu-18.04
351+
runs-on: ubuntu-20.04
336352
timeout-minutes: 40
337353
needs: [project, linters, protos, man]
338354

@@ -350,41 +366,37 @@ jobs:
350366
env:
351367
GOTEST: gotestsum --
352368
steps:
353-
- uses: actions/setup-go@v2
369+
- uses: actions/setup-go@v3
354370
with:
355-
go-version: '1.18.7'
371+
go-version: ${{ env.GO_VERSION }}
356372

357-
- uses: actions/checkout@v2
373+
- uses: actions/checkout@v3
358374

359375
- name: Install containerd dependencies
360376
env:
361377
RUNC_FLAVOR: ${{ matrix.runc }}
362-
GOFLAGS: -modcacherw
363378
run: |
364-
sudo apt-get install -y gperf
365-
sudo -E PATH=$PATH script/setup/install-seccomp
366-
sudo -E PATH=$PATH script/setup/install-runc
367-
sudo -E PATH=$PATH script/setup/install-cni $(grep containernetworking/plugins go.mod | awk '{print $2}')
368-
sudo -E PATH=$PATH script/setup/install-critools
379+
sudo apt-get install -y gperf libbtrfs-dev
380+
script/setup/install-seccomp
381+
script/setup/install-runc
382+
script/setup/install-cni $(grep containernetworking/plugins go.mod | awk '{print $2}')
383+
script/setup/install-critools
384+
script/setup/install-failpoint-binaries
369385
370386
- name: Install criu
371387
run: |
372388
sudo add-apt-repository ppa:criu/ppa
373389
sudo apt-get update
374390
sudo apt-get install -y criu
375391
376-
- name: Install failpoint binaries
377-
run: |
378-
script/setup/install-failpoint-binaries
379-
380392
- name: Install containerd
381393
env:
382394
CGO_ENABLED: 1
383395
run: |
384396
make binaries GO_BUILD_FLAGS="-mod=vendor"
385397
sudo -E PATH=$PATH make install
386398
387-
- run: sudo -E PATH=$PATH script/setup/install-gotestsum
399+
- run: script/setup/install-gotestsum
388400
- name: Tests
389401
env:
390402
GOTESTSUM_JUNITFILE: ${{github.workspace}}/test-unit-root-junit.xml
@@ -456,7 +468,7 @@ jobs:
456468
mount
457469
df
458470
losetup -l
459-
- uses: actions/upload-artifact@v2
471+
- uses: actions/upload-artifact@v3
460472
if: always()
461473
with:
462474
name: TestResults ${{ matrix.runtime }} ${{matrix.runc}}
@@ -473,16 +485,16 @@ jobs:
473485
GOTEST: gotestsum --
474486

475487
steps:
476-
- uses: actions/setup-go@v2
488+
- uses: actions/setup-go@v3
477489
with:
478-
go-version: '1.18.7'
479-
- uses: actions/checkout@v2
480-
- run: sudo -E PATH=$PATH script/setup/install-gotestsum
490+
go-version: ${{ env.GO_VERSION }}
491+
- uses: actions/checkout@v3
492+
- run: script/setup/install-gotestsum
481493
- name: Tests
482494
env:
483495
GOTESTSUM_JUNITFILE: "${{ github.workspace }}/macos-test-junit.xml"
484496
run: make test
485-
- uses: actions/upload-artifact@v2
497+
- uses: actions/upload-artifact@v3
486498
if: always()
487499
with:
488500
name: TestResults MacOS
@@ -506,10 +518,10 @@ jobs:
506518
env:
507519
GOTEST: gotestsum --
508520
steps:
509-
- uses: actions/checkout@v2
521+
- uses: actions/checkout@v3
510522

511523
- name: "Cache ~/.vagrant.d/boxes"
512-
uses: actions/cache@v2
524+
uses: actions/cache@v3
513525
with:
514526
path: ~/.vagrant.d/boxes
515527
key: vagrant-${{ hashFiles('Vagrantfile*') }}
@@ -551,7 +563,7 @@ jobs:
551563
vagrant plugin install vagrant-scp
552564
vagrant scp :/tmp/test-integration-junit.xml "${{ github.workspace }}/"
553565
vagrant scp :/tmp/critestreport "${{ github.workspace }}/critestreport"
554-
- uses: actions/upload-artifact@v2
566+
- uses: actions/upload-artifact@v3
555567
if: always()
556568
with:
557569
# ${{ matrix.box }} cannot be used here due to character limitation
@@ -567,10 +579,10 @@ jobs:
567579
timeout-minutes: 45
568580
needs: [project, linters, protos, man]
569581
steps:
570-
- uses: actions/checkout@v2
582+
- uses: actions/checkout@v3
571583

572584
- name: "Cache ~/.vagrant.d/boxes"
573-
uses: actions/cache@v2
585+
uses: actions/cache@v3
574586
with:
575587
path: ~/.vagrant.d/boxes
576588
key: vagrant-${{ hashFiles('Vagrantfile*') }}
Collapse file

‎.github/workflows/codeql.yml‎

Copy file name to clipboardExpand all lines: .github/workflows/codeql.yml
+5-5Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ jobs:
2222

2323
steps:
2424
- name: Checkout repository
25-
uses: actions/checkout@v2
25+
uses: actions/checkout@v3
2626

27-
- uses: actions/setup-go@v2
27+
- uses: actions/setup-go@v3
2828
with:
29-
go-version: 1.18.7
29+
go-version: 1.18.9
3030

3131
# Initializes the CodeQL tools for scanning.
3232
- name: Initialize CodeQL
33-
uses: github/codeql-action/init@v1
33+
uses: github/codeql-action/init@v2
3434
# Override language selection by uncommenting this and choosing your languages
3535
# with:
3636
# languages: go, javascript, csharp, python, cpp, java
@@ -40,4 +40,4 @@ jobs:
4040
make
4141
4242
- name: Perform CodeQL Analysis
43-
uses: github/codeql-action/analyze@v1
43+
uses: github/codeql-action/analyze@v2
Collapse file

‎.github/workflows/images.yml‎

Copy file name to clipboardExpand all lines: .github/workflows/images.yml
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ jobs:
2222
working-directory: src/github.com/containerd/containerd
2323

2424
steps:
25-
- uses: actions/setup-go@v2
25+
- uses: actions/setup-go@v3
2626
with:
27-
go-version: '1.18.7'
27+
go-version: '1.18.9'
2828

29-
- uses: actions/checkout@v2
29+
- uses: actions/checkout@v3
3030
with:
3131
path: src/github.com/containerd/containerd
3232

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.