Update default differs on darwin

dmcgowan · k8s-infra-cherrypick-robot · commit 2055d3c62e85 · 2025-11-19T00:13:56.000Z
Use the erofs differ by default on darwin. This could be default for all
Unix platforms but limit the default changes to fix broken cases for backports.

Signed-off-by: Derek McGowan &lt;derek@mcg.dev&gt;
diff --git a/plugins/services/diff/service_darwin.go b/plugins/services/diff/service_darwin.go
@@ -0,0 +1,22 @@
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package diff
+
+var defaultDifferConfig = &config{
+	Order:  []string{"erofs", "walking"},
+	SyncFs: false,
+}
diff --git a/plugins/services/diff/service_unix.go b/plugins/services/diff/service_unix.go
@@ -1,4 +1,4 @@
-//go:build !windows
+//go:build !windows && !darwin
 
 /*
    Copyright The containerd Authors.

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-//go:build !windows`
	`1`	`+//go:build !windows && !darwin`
`2`	`2`
`3`	`3`	`/*`
`4`	`4`	`Copyright The containerd Authors.`