Skip to content

[release/1.5 backport] Allow expanded DNS configuration#5893

Merged
estesp merged 1 commit intocontainerd:release/1.5from
gjkim42:cherry-pick-of-#5878
Aug 20, 2021
Merged

[release/1.5 backport] Allow expanded DNS configuration#5893
estesp merged 1 commit intocontainerd:release/1.5from
gjkim42:cherry-pick-of-#5878

Conversation

@gjkim42
Copy link
Copy Markdown
Contributor

@gjkim42 gjkim42 commented Aug 19, 2021

Cherry pick of #5878 on release/1.5.

#5878: Allow expanded DNS configuration

@k8s-ci-robot
Copy link
Copy Markdown

k8s-ci-robot commented Aug 19, 2021

Hi @gjkim42. 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.

@gjkim42
Copy link
Copy Markdown
Contributor Author

gjkim42 commented Aug 19, 2021

@mikebrow

Can we cherry-pick this to release/1.5?
I am not sure about containerd's version control.

estesp
estesp approved these changes Aug 19, 2021
View reviewed changes
Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

I think this is reasonable to backport to release/1.5

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Aug 19, 2021

Build succeeded.

@gjkim42 gjkim42 mentioned this pull request Aug 19, 2021
Closed
2 tasks
Zyqsempai
Zyqsempai approved these changes Aug 19, 2021
View reviewed changes
Copy link
Copy Markdown
Contributor

@Zyqsempai Zyqsempai 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 Aug 19, 2021

Will have to merge #5894 to get CI working in release/1.5 again; the available image references used in Linux integration tests changed on the GCR mirror and we haven't had a PR in release/1.5 since then.

@kzys
Copy link
Copy Markdown
Member

kzys commented Aug 19, 2021

@gjkim42 Could you rebase this branch against release/1.5? #5894 has been merged there and it should make the tests all green.

@gjkim42 gjkim42 force-pushed the cherry-pick-of-#5878 branch from 5df7602 to cdbdcbd Compare August 19, 2021 23:21
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Aug 19, 2021

Build succeeded.

@gjkim42 gjkim42 force-pushed the cherry-pick-of-#5878 branch from cdbdcbd to 3665639 Compare August 19, 2021 23:50
@gjkim42 gjkim42 force-pushed the cherry-pick-of-#5878 branch from 3665639 to 27e1646 Compare August 20, 2021 00:14
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Aug 20, 2021

Build succeeded.

@gjkim42
Copy link
Copy Markdown
Contributor Author

gjkim42 commented Aug 20, 2021

rebased. thanks :)

@estesp estesp merged commit 69e5db8 into containerd:release/1.5 Aug 20, 2021
@gjkim42 gjkim42 deleted the cherry-pick-of-#5878 branch September 2, 2021 11:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@estesp estesp estesp approved these changes

+1 more reviewer

@Zyqsempai Zyqsempai Zyqsempai approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

needs-ok-to-test

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@gjkim42 @k8s-ci-robot @estesp @kzys @Zyqsempai