github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #4675 from mikebrow/update-default-config-doc-for-annotations

Browse Source 
change default for disable snapshot annotations
This commit is contained in:
Phil Estes 2020-10-30 09:33:11 -04:00 committed by GitHub
commit 9a672cca91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docs/config.md
View File

@ -109,7 +109,8 @@ version = 2
# disable_snapshot_annotations disables to pass additional annotations (image # disable_snapshot_annotations disables to pass additional annotations (image
# related information) to snapshotters. These annotations are required by # related information) to snapshotters. These annotations are required by
# stargz snapshotter (https://github.com/containerd/stargz-snapshotter) # stargz snapshotter (https://github.com/containerd/stargz-snapshotter)
disable_snapshot_annotations = false # changed to default true with https://github.com/containerd/containerd/pull/4665 and subsequent service refreshes.
disable_snapshot_annotations = true
# discard_unpacked_layers allows GC to remove layers from the content store after # discard_unpacked_layers allows GC to remove layers from the content store after
# successfully unpacking these layers to the snapshotter. # successfully unpacking these layers to the snapshotter.
@ -247,10 +248,10 @@ version = 2
# key_model defines the name of the key model used for how the cri obtains # key_model defines the name of the key model used for how the cri obtains
# keys used for decryption of encrypted container images. # keys used for decryption of encrypted container images.
# The [decryption document](https://github.com/containerd/cri/blob/master/docs/decryption.md) # The [decryption document](https://github.com/containerd/cri/blob/master/docs/decryption.md)
# contains additional information about the key models available. # contains additional information about the key models available.
# #
# Set of available string options: {"", "node"} # Set of available string options: {"", "node"}
# Omission of this field defaults to the empty string "", which indicates no key model, # Omission of this field defaults to the empty string "", which indicates no key model,
# disabling image decryption. # disabling image decryption.
# #
# In order to use the decryption feature, additional configurations must be made. # In order to use the decryption feature, additional configurations must be made.