Skip to content

Commit 8a7409e

Browse files
cadeniyik8s-infra-cherrypick-robot
authored andcommitted
Reinstate image decryption
Signed-off-by: Chris Adeniyi-Jones <[email protected]>
1 parent dea7da5 commit 8a7409e

1 file changed

Lines changed: 1 addition & 3 deletions

File tree

internal/cri/server/images/image_pull.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -263,8 +263,7 @@ func (c *CRIImageService) pullImageWithLocalPull(
263263
}),
264264
}
265265

266-
// Temporarily removed for v2 upgrade
267-
//pullOpts = append(pullOpts, c.encryptedImagesPullOpts()...)
266+
pullOpts = append(pullOpts, c.encryptedImagesPullOpts()...)
268267
if !c.config.DisableSnapshotAnnotations {
269268
pullOpts = append(pullOpts,
270269
containerd.WithImageHandlerWrapper(snpkg.AppendInfoHandlerWrapper(ref)))
@@ -636,7 +635,6 @@ func (c *CRIImageService) registryEndpoints(host string) ([]string, error) {
636635

637636
// encryptedImagesPullOpts returns the necessary list of pull options required
638637
// for decryption of encrypted images based on the cri decryption configuration.
639-
// Temporarily removed for v2 upgrade
640638
func (c *CRIImageService) encryptedImagesPullOpts() []containerd.RemoteOpt {
641639
if c.config.ImageDecryption.KeyModel == criconfig.KeyModelNode {
642640
ltdd := imgcrypt.Payload{}

0 commit comments

Comments
 (0)