Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Aug 20, 2021

Conversation

gjkim42
Copy link
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

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.

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
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.

Copy link
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

theopenlab-ci bot commented Aug 19, 2021

Build succeeded.

Copy link
Member

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

@theopenlab-ci
Copy link

theopenlab-ci bot commented Aug 19, 2021

Build succeeded.

Signed-off-by: Gunju Kim <gjkim042@gmail.com>
@theopenlab-ci
Copy link

theopenlab-ci bot commented Aug 20, 2021

Build succeeded.

@gjkim42
Copy link
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants