added pr suggestions

Signed-off-by: Robbie Buxton <{ID}+{username}@users.noreply.github.com>

Author: Robbie Buxton

Dockerfile

@@ -12,7 +12,7 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
-ARG CONTAINERD_VERSION=v1.0.2-stargz
+ARG CONTAINERD_VERSION=v1.7.2-stargz
 ARG RUNC_VERSION=v1.1.7
 ARG CNI_PLUGINS_VERSION=v1.3.0
 ARG NERDCTL_VERSION=1.4.0

cmd/go.mod

@@ -145,4 +145,4 @@ replace (
 	github.com/containerd/stargz-snapshotter/ipfs => ../ipfs
 )
 
-replace github.com/containerd/containerd => github.com/pdtpartners/containerd v1.0.2-stargz
+replace github.com/containerd/containerd => github.com/pdtpartners/containerd v1.7.2-stargz

cmd/go.sum

@@ -278,8 +278,8 @@ github.com/opencontainers/runtime-spec v1.1.0-rc.3/go.mod h1:jwyrGlmzljRJv/Fgzds
 github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI=
 github.com/opencontainers/selinux v1.11.0 h1:+5Zbo97w3Lbmb3PeqQtpmTkMwsW5nRI3YaLpt7tQ7oU=
 github.com/opencontainers/selinux v1.11.0/go.mod h1:E5dMC3VPuVvVHDYmi78qvhJp8+M586T4DlDRYpFkyec=
-github.com/pdtpartners/containerd v1.0.2-stargz h1:wBWnKU7wKvNijInjRuduno2U6yFbKyaU8hoiIReFflg=
-github.com/pdtpartners/containerd v1.0.2-stargz/go.mod h1:afcz74+K10M/+cjGHIVQrCt3RAQhUSCAjJ9iMYhhkuI=
+github.com/pdtpartners/containerd v1.7.2-stargz h1:b/o+aD51Am8oWD01MRAbfuBWt+oR1OzJaXWIWtAhLis=
+github.com/pdtpartners/containerd v1.7.2-stargz/go.mod h1:afcz74+K10M/+cjGHIVQrCt3RAQhUSCAjJ9iMYhhkuI=
 github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
 github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=

go.mod

@@ -117,4 +117,4 @@ require (
 // Import local package for estargz.
 replace github.com/containerd/stargz-snapshotter/estargz => ./estargz
 
-replace github.com/containerd/containerd => github.com/pdtpartners/containerd v1.0.2-stargz
+replace github.com/containerd/containerd => github.com/pdtpartners/containerd v1.7.2-stargz

go.sum

@@ -228,8 +228,8 @@ github.com/opencontainers/runtime-spec v1.1.0-rc.3/go.mod h1:jwyrGlmzljRJv/Fgzds
 github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI=
 github.com/opencontainers/selinux v1.11.0 h1:+5Zbo97w3Lbmb3PeqQtpmTkMwsW5nRI3YaLpt7tQ7oU=
 github.com/opencontainers/selinux v1.11.0/go.mod h1:E5dMC3VPuVvVHDYmi78qvhJp8+M586T4DlDRYpFkyec=
-github.com/pdtpartners/containerd v1.0.2-stargz h1:wBWnKU7wKvNijInjRuduno2U6yFbKyaU8hoiIReFflg=
-github.com/pdtpartners/containerd v1.0.2-stargz/go.mod h1:afcz74+K10M/+cjGHIVQrCt3RAQhUSCAjJ9iMYhhkuI=
+github.com/pdtpartners/containerd v1.7.2-stargz h1:b/o+aD51Am8oWD01MRAbfuBWt+oR1OzJaXWIWtAhLis=
+github.com/pdtpartners/containerd v1.7.2-stargz/go.mod h1:afcz74+K10M/+cjGHIVQrCt3RAQhUSCAjJ9iMYhhkuI=
 github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
 github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=

script/k3s-argo-workflow/run.sh

@@ -126,7 +126,7 @@ wget -O "${ORG_ARGOYAML}" https://raw.githubusercontent.com/argoproj/argo-workfl
 
 git clone -b ${K3S_VERSION} --depth 1 "${K3S_REPO}" "${TMP_K3S_REPO}"
 sed -i "s|github.com/k3s-io/stargz-snapshotter .*$|$(realpath ${REPO})|g" "${TMP_K3S_REPO}/go.mod"
-sed -i "s|github.com/k3s-io/containerd v1.7.1-k3s1|github.com/pdtpartners/containerd v1.0.2-stargz|g" "${TMP_K3S_REPO}/go.mod"
+sed -i "s|github.com/k3s-io/containerd v1.7.3-k3s1|github.com/pdtpartners/containerd v1.7.2-stargz|g" "${TMP_K3S_REPO}/go.mod"
 
 echo "replace github.com/containerd/stargz-snapshotter/estargz => $(realpath ${REPO})/estargz" >> "${TMP_K3S_REPO}/go.mod"
 
@@ -139,6 +139,7 @@ cat "${TMP_K3S_REPO}/go.mod"
 
 sed -i -E 's|(ENV DAPPER_RUN_ARGS .*)|\1 -v '"$(realpath ${REPO})":"$(realpath ${REPO})"':ro|g' "${TMP_K3S_REPO}/Dockerfile.dapper"
 sed -i -E 's|(ENV DAPPER_ENV .*)|\1 DOCKER_BUILDKIT|g' "${TMP_K3S_REPO}/Dockerfile.dapper"
+sed -i 's|\${VERSION_CONTAINERD}|v1.7.2-stargz|g' "${TMP_K3S_REPO}/scripts/download"
 sed -i -E 's|github.com/k3s-io/containerd|github.com/pdtpartners/containerd|g' "${TMP_K3S_REPO}/scripts/download"
 (
     cd "${TMP_K3S_REPO}" && \

script/k3s/run-k3s.sh

@@ -55,7 +55,7 @@ trap 'cleanup "$?"' EXIT SIGHUP SIGINT SIGQUIT SIGTERM
 echo "Preparing node image..."
 git clone -b ${K3S_VERSION} --depth 1 "${K3S_REPO}" "${TMP_K3S_REPO}"
 sed -i "s|github.com/k3s-io/stargz-snapshotter .*$|$(realpath ${REPO})|g" "${TMP_K3S_REPO}/go.mod"
-sed -i "s|github.com/k3s-io/containerd v1.7.1-k3s1|github.com/pdtpartners/containerd v1.0.2-stargz|g" "${TMP_K3S_REPO}/go.mod"
+sed -i "s|github.com/k3s-io/containerd v1.7.3-k3s1|github.com/pdtpartners/containerd v1.7.2-stargz|g" "${TMP_K3S_REPO}/go.mod"
 
 echo "replace github.com/containerd/stargz-snapshotter/estargz => $(realpath ${REPO})/estargz" >> "${TMP_K3S_REPO}/go.mod"
 
@@ -68,7 +68,9 @@ cat "${TMP_K3S_REPO}/go.mod"
 
 sed -i -E 's|(ENV DAPPER_RUN_ARGS .*)|\1 -v '"$(realpath ${REPO})":"$(realpath ${REPO})"':ro|g' "${TMP_K3S_REPO}/Dockerfile.dapper"
 sed -i -E 's|(ENV DAPPER_ENV .*)|\1 DOCKER_BUILDKIT|g' "${TMP_K3S_REPO}/Dockerfile.dapper"
+sed -i 's|\${VERSION_CONTAINERD}|v1.7.2-stargz|g' "${TMP_K3S_REPO}/scripts/download"
 sed -i -E 's|github.com/k3s-io/containerd|github.com/pdtpartners/containerd|g' "${TMP_K3S_REPO}/scripts/download"
+
 (
     cd "${TMP_K3S_REPO}" && \
         git config user.email "[email protected]" && \

snapshot/snapshot.go

@@ -98,7 +98,7 @@ func AllowInvalidMountsOnRestart(config *SnapshotterConfig) error {
 }
 
 type snapshotter struct {
-	overlay.Snapshotter
+	snapshots.Snapshotter
 	root        string
 	ms          *storage.MetaStore
 	asyncRemove bool
@@ -130,17 +130,17 @@ func NewSnapshotter(ctx context.Context, root string, targetFs FileSystem, opts
 		return nil, err
 	}
 
-	snapshotterOpts := []overlay.Opt{}
-	snapshotterOpts = append(snapshotterOpts, overlay.WithMetaStore(ms))
+	overlayOpts := []overlay.Opt{}
+	overlayOpts = append(overlayOpts, overlay.WithMetaStore(ms))
 	if config.asyncRemove {
-		snapshotterOpts = append(snapshotterOpts, overlay.AsynchronousRemove)
+		overlayOpts = append(overlayOpts, overlay.AsynchronousRemove)
 	}
-	generalSnapshotter, err := overlay.NewSnapshotter(root, snapshotterOpts...)
+	overlaySnapshotter, err := overlay.NewSnapshotter(root, overlayOpts...)
 	if err != nil {
 		return nil, err
 	}
 	o := &snapshotter{
-		Snapshotter:                 *generalSnapshotter.(*overlay.Snapshotter),
+		Snapshotter:                 overlaySnapshotter,
 		root:                        root,
 		ms:                          ms,
 		asyncRemove:                 config.asyncRemove,
@@ -232,11 +232,7 @@ func (o *snapshotter) View(ctx context.Context, key, parent string, opts ...snap
 	if err != nil {
 		return nil, err
 	}
-	mnts, err := o.Snapshotter.View(ctx, key, parent, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return mnts, err
+	return o.Snapshotter.View(ctx, key, parent, opts...)
 }
 
 // Mounts returns the mounts for the transaction identified by key. Can be
@@ -251,10 +247,6 @@ func (o *snapshotter) Mounts(ctx context.Context, key string) ([]mount.Mount, er
 	return o.Snapshotter.Mounts(ctx, key)
 }
 
-func (o *snapshotter) Commit(ctx context.Context, name, key string, opts ...snapshots.Opt) error {
-	return o.Snapshotter.Commit(ctx, name, key, opts...)
-}
-
 // Remove abandons the snapshot identified by key. The snapshot will
 // immediately become unavailable and unrecoverable. Disk space will
 // be freed up on the next call to `Cleanup`.