Skip to content

Uncomment call to add options for pulling encrypted images#12705

Merged
mikebrow merged 1 commit into
containerd:mainfrom
cadeniyi:fix-image-decryption
Dec 19, 2025
Merged

Uncomment call to add options for pulling encrypted images#12705
mikebrow merged 1 commit into
containerd:mainfrom
cadeniyi:fix-image-decryption

Conversation

@cadeniyi

@cadeniyi cadeniyi commented Dec 18, 2025

Copy link
Copy Markdown
Contributor

Looks like the call should have been uncommented when the fix for the circular dependencies was done.

@mikebrow @dmcgowan

@github-project-automation github-project-automation Bot moved this to Needs Triage in Pull Request Review Dec 18, 2025
@dosubot dosubot Bot added the area/cri Container Runtime Interface (CRI) label Dec 18, 2025
@mikebrow

mikebrow commented Dec 18, 2025

Copy link
Copy Markdown
Member

needs a signature line.. git config .. to setup username and email.. git commit -s --amend then force push

@mikebrow

mikebrow commented Dec 18, 2025

Copy link
Copy Markdown
Member

related to.. #10275

@mikebrow mikebrow added cherry-pick/2.1.x Change to be cherry picked to release/2.1 branch cherry-pick/2.2.x Change to be cherry picked to release/2.2 branch labels Dec 18, 2025
austinvazquez
austinvazquez reviewed Dec 18, 2025
View reviewed changes
Comment thread internal/cri/server/images/image_pull.go
@cadeniyi cadeniyi force-pushed the fix-image-decryption branch from fbb344f to cde90a0 Compare December 18, 2025 19:40
@mikebrow

mikebrow commented Dec 18, 2025

Copy link
Copy Markdown
Member

each commit has to be signed.. use --amend to avoid having to -s each time.. probably best to squash these two commits as we don't have a squash with merge option

@cadeniyi cadeniyi force-pushed the fix-image-decryption branch 4 times, most recently from 6849839 to b6ba466 Compare December 18, 2025 21:22
@cadeniyi
Reinstate image decryption
c0052e1 
Signed-off-by: Chris Adeniyi-Jones <chris.adeniyi-jones@arm.com>
@cadeniyi cadeniyi force-pushed the fix-image-decryption branch from b6ba466 to c0052e1 Compare December 18, 2025 21:57
austinvazquez
austinvazquez approved these changes Dec 19, 2025
View reviewed changes

@austinvazquez austinvazquez left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM thanks.

@github-project-automation github-project-automation Bot moved this from Needs Triage to Review In Progress in Pull Request Review Dec 19, 2025
@AkihiroSuda AkihiroSuda added this pull request to the merge queue Dec 19, 2025
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Dec 19, 2025
@AkihiroSuda AkihiroSuda added this pull request to the merge queue Dec 19, 2025
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Dec 19, 2025
@mikebrow mikebrow added this pull request to the merge queue Dec 19, 2025
Merged via the queue into containerd:main with commit 92fec18 Dec 19, 2025
89 of 92 checks passed
@github-project-automation github-project-automation Bot moved this from Review In Progress to Done in Pull Request Review Dec 19, 2025
@mikebrow

mikebrow commented Dec 19, 2025

Copy link
Copy Markdown
Member

/cherry-pick release/2.2

@mikebrow

mikebrow commented Dec 19, 2025

Copy link
Copy Markdown
Member

/cherry-pick release/2.1

@k8s-infra-cherrypick-robot

k8s-infra-cherrypick-robot commented Dec 19, 2025

Copy link
Copy Markdown

@mikebrow: new pull request created: #12712

Details

In response to this:

/cherry-pick release/2.2

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Dec 19, 2025
Merged
@k8s-infra-cherrypick-robot

k8s-infra-cherrypick-robot commented Dec 19, 2025

Copy link
Copy Markdown

@mikebrow: new pull request created: #12713

Details

In response to this:

/cherry-pick release/2.1

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Dec 19, 2025
Merged
@austinvazquez austinvazquez added cherry-picked/2.1.x PR commits are cherry picked into the release/2.1 branch cherry-picked/2.2.x PR commits are cherry-picked into release/2.2 branch and removed cherry-pick/2.1.x Change to be cherry picked to release/2.1 branch cherry-pick/2.2.x Change to be cherry picked to release/2.2 branch labels Dec 22, 2025
@cadeniyi cadeniyi deleted the fix-image-decryption branch December 22, 2025 16:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

@djdongjin djdongjin djdongjin approved these changes

@austinvazquez austinvazquez austinvazquez approved these changes

Assignees

No one assigned

Labels

area/cri Container Runtime Interface (CRI) cherry-picked/2.1.x PR commits are cherry picked into the release/2.1 branch cherry-picked/2.2.x PR commits are cherry-picked into release/2.2 branch size/XS

Projects

Pull Request Review
Archived in project

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@cadeniyi @mikebrow @k8s-infra-cherrypick-robot @AkihiroSuda @djdongjin @austinvazquez @k8s-ci-robot