Merge pull request #6725 from dmcgowan/prepare-v1.6.2

dmcgowan · web-flow · commit de8046a5501d · 2022-03-23T19:25:21.000-07:00
Prepare release notes for v1.6.2
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -32,6 +32,7 @@ jobs:
       - uses: golangci/golangci-lint-action@v3
         with:
           version: v1.44.2
+          skip-cache: true
           args: --timeout=5m
 
   #
diff --git a/releases/v1.6.2.toml b/releases/v1.6.2.toml
@@ -0,0 +1,21 @@
+# commit to be tagged for new release
+commit = "HEAD"
+
+project_name = "containerd"
+github_repo = "containerd/containerd"
+match_deps = "^github.com/(containerd/[a-zA-Z0-9-]+)$"
+
+# previous release
+previous = "v1.6.1"
+
+pre_release = false
+
+preface = """\
+The second patch release for containerd 1.6 includes a fix for
+[CVE-2022-24769](https://github.com/containerd/containerd/security/advisories/GHSA-c9cp-9c75-9v8c).
+
+### Notable Updates
+
+* **Fix the inheritable capability defaults** ([GHSA-c9cp-9c75-9v8c](https://github.com/containerd/containerd/security/advisories/GHSA-c9cp-9c75-9v8c))
+
+See the changelog for complete list of changes"""
diff --git a/runtime/v2/shim/shim.go b/runtime/v2/shim/shim.go
@@ -169,7 +169,7 @@ func setLogger(ctx context.Context, id string) (context.Context, error) {
 		l.Logger.SetLevel(logrus.DebugLevel)
 	}
 	f, err := openLog(ctx, id)
-	if err != nil {
+	if err != nil { //nolint:staticcheck // Ignore SA4023 as some platforms always return error
 		return ctx, err
 	}
 	l.Logger.SetOutput(f)
@@ -255,12 +255,12 @@ func run(ctx context.Context, manager Manager, initFunc Init, name string, confi
 	setRuntime()
 
 	signals, err := setupSignals(config)
-	if err != nil {
+	if err != nil { //nolint:staticcheck // Ignore SA4023 as some platforms always return error
 		return err
 	}
 
 	if !config.NoSubreaper {
-		if err := subreaper(); err != nil {
+		if err := subreaper(); err != nil { //nolint:staticcheck // Ignore SA4023 as some platforms always return error
 			return err
 		}
 	}
@@ -418,7 +418,7 @@ func run(ctx context.Context, manager Manager, initFunc Init, name string, confi
 	}
 
 	server, err := newServer()
-	if err != nil {
+	if err != nil { //nolint:staticcheck // Ignore SA4023 as some platforms always return error
 		return fmt.Errorf("failed creating server: %w", err)
 	}
 
@@ -428,7 +428,7 @@ func run(ctx context.Context, manager Manager, initFunc Init, name string, confi
 		}
 	}
 
-	if err := serve(ctx, server, signals, sd.Shutdown); err != nil {
+	if err := serve(ctx, server, signals, sd.Shutdown); err != nil { //nolint:staticcheck // Ignore SA4023 as some platforms always return error
 		if err != shutdown.ErrShutdown {
 			return err
 		}
@@ -460,7 +460,7 @@ func serve(ctx context.Context, server *ttrpc.Server, signals chan os.Signal, sh
 	}
 
 	l, err := serveListener(socketFlag)
-	if err != nil {
+	if err != nil { //nolint:staticcheck // Ignore SA4023 as some platforms always return error
 		return err
 	}
 	go func() {
diff --git a/version/version.go b/version/version.go
@@ -23,7 +23,7 @@ var (
 	Package = "github.com/containerd/containerd"
 
 	// Version holds the complete version number. Filled in at linking time.
-	Version = "1.6.1+unknown"
+	Version = "1.6.2+unknown"
 
 	// Revision is filled with the VCS (e.g. git) revision being used to build
 	// the program at linking time.

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ jobs:`
`32`	`32`	`- uses: golangci/golangci-lint-action@v3`
`33`	`33`	`with:`
`34`	`34`	`version: v1.44.2`
	`35`	`+ skip-cache: true`
`35`	`36`	`args: --timeout=5m`
`36`	`37`
`37`	`38`	`#`
Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ func setLogger(ctx context.Context, id string) (context.Context, error) {`
`169`	`169`	`l.Logger.SetLevel(logrus.DebugLevel)`
`170`	`170`	`}`
`171`	`171`	`f, err := openLog(ctx, id)`
`172`		`- if err != nil {`
	`172`	`+ if err != nil { //nolint:staticcheck // Ignore SA4023 as some platforms always return error`
`173`	`173`	`return ctx, err`
`174`	`174`	`}`
`175`	`175`	`l.Logger.SetOutput(f)`
`@@ -255,12 +255,12 @@ func run(ctx context.Context, manager Manager, initFunc Init, name string, confi`
`255`	`255`	`setRuntime()`
`256`	`256`
`257`	`257`	`signals, err := setupSignals(config)`
`258`		`- if err != nil {`
	`258`	`+ if err != nil { //nolint:staticcheck // Ignore SA4023 as some platforms always return error`
`259`	`259`	`return err`
`260`	`260`	`}`
`261`	`261`
`262`	`262`	`if !config.NoSubreaper {`
`263`		`- if err := subreaper(); err != nil {`
	`263`	`+ if err := subreaper(); err != nil { //nolint:staticcheck // Ignore SA4023 as some platforms always return error`
`264`	`264`	`return err`
`265`	`265`	`}`
`266`	`266`	`}`
`@@ -418,7 +418,7 @@ func run(ctx context.Context, manager Manager, initFunc Init, name string, confi`
`418`	`418`	`}`
`419`	`419`
`420`	`420`	`server, err := newServer()`
`421`		`- if err != nil {`
	`421`	`+ if err != nil { //nolint:staticcheck // Ignore SA4023 as some platforms always return error`
`422`	`422`	`return fmt.Errorf("failed creating server: %w", err)`
`423`	`423`	`}`
`424`	`424`
`@@ -428,7 +428,7 @@ func run(ctx context.Context, manager Manager, initFunc Init, name string, confi`
`428`	`428`	`}`
`429`	`429`	`}`
`430`	`430`
`431`		`- if err := serve(ctx, server, signals, sd.Shutdown); err != nil {`
	`431`	`+ if err := serve(ctx, server, signals, sd.Shutdown); err != nil { //nolint:staticcheck // Ignore SA4023 as some platforms always return error`
`432`	`432`	`if err != shutdown.ErrShutdown {`
`433`	`433`	`return err`
`434`	`434`	`}`
`@@ -460,7 +460,7 @@ func serve(ctx context.Context, server *ttrpc.Server, signals chan os.Signal, sh`
`460`	`460`	`}`
`461`	`461`
`462`	`462`	`l, err := serveListener(socketFlag)`
`463`		`- if err != nil {`
	`463`	`+ if err != nil { //nolint:staticcheck // Ignore SA4023 as some platforms always return error`
`464`	`464`	`return err`
`465`	`465`	`}`
`466`	`466`	`go func() {`