Skip to content

Updates oci image config to support upstream ArgsEscaped#7483

Merged
kevpar merged 1 commit intocontainerd:mainfrom
jterry75:jterry75/update_image_config_argsescaped
Oct 11, 2022
Merged

Updates oci image config to support upstream ArgsEscaped#7483
kevpar merged 1 commit intocontainerd:mainfrom
jterry75:jterry75/update_image_config_argsescaped

Conversation

@jterry75
Copy link
Copy Markdown
Contributor

@jterry75 jterry75 commented Oct 5, 2022

ArgsEscaped has now been merged into upstream OCI image spec. This change removes the workaround we were doing in containerd to deserialize the extra json outside of the spec and instead just uses the formal spec types.

Signed-off-by: Justin Terry [email protected]

@k8s-ci-robot
Copy link
Copy Markdown

Hi @jterry75. Thanks for your PR.

I'm waiting for a containerd member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

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/test-infra repository.

@jterry75
Copy link
Copy Markdown
Contributor Author

jterry75 commented Oct 5, 2022

@kevpar / @marosset - Finally!

@marosset
Copy link
Copy Markdown
Contributor

marosset commented Oct 5, 2022

@kevpar / @marosset - Finally!

Finally!

Copy link
Copy Markdown
Member

@kevpar kevpar left a comment

Choose a reason for hiding this comment

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

LGTM. Nice that we can do this now :)

@marosset
Copy link
Copy Markdown
Contributor

marosset commented Oct 5, 2022

/lgtm

@kevpar
Copy link
Copy Markdown
Member

kevpar commented Oct 6, 2022

Per CI, maybe needs a go mod tidy first?

@samuelkarp
Copy link
Copy Markdown
Member

/ok-to-test

Copy link
Copy Markdown
Member

@dcantah dcantah left a comment

Choose a reason for hiding this comment

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

LGTM!

@estesp
Copy link
Copy Markdown
Member

estesp commented Oct 10, 2022

ping @jterry -- looks like this is good, but needs a go mod tidy possibly to get CI runs going?

@jterry75 jterry75 force-pushed the jterry75/update_image_config_argsescaped branch from abab1e8 to b66e558 Compare October 11, 2022 20:08
@jterry75
Copy link
Copy Markdown
Contributor Author

My bad folks, got distracted. Updated the go.sum file.

@estesp
Copy link
Copy Markdown
Member

estesp commented Oct 11, 2022

Sorry; also need to run the go mod tidy in integration/client to make CI happy :-]

@jterry75
Copy link
Copy Markdown
Contributor Author

Golang....

ArgsEscaped has now been merged into upstream OCI image spec.
This change removes the workaround we were doing in containerd
to deserialize the extra json outside of the spec and instead
just uses the formal spec types.

Signed-off-by: Justin Terry <[email protected]>
@jterry75 jterry75 force-pushed the jterry75/update_image_config_argsescaped branch from b66e558 to d4b9dad Compare October 11, 2022 20:30
@kevpar
Copy link
Copy Markdown
Member

kevpar commented Oct 11, 2022

Yay! Thanks @jterry75!

@kevpar kevpar merged commit e6b5311 into containerd:main Oct 11, 2022
@jterry75 jterry75 deleted the jterry75/update_image_config_argsescaped branch October 12, 2022 00:16
@jterry75
Copy link
Copy Markdown
Contributor Author

I'm just happy it didn't go over 1 year! Ty all

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants