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.

Sign up for GitHub

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

Jump to bottom

Automated cherry pick of #11741: Compare OpenStack security groups deterministically #11743: Make forwardToKubeDNS work in the NodeLocal DNSCache template #11757

Merged
merged 2 commits into from
Jun 16, 2021
Merged

Automated cherry pick of #11741: Compare OpenStack security groups deterministically #11743: Make forwardToKubeDNS work in the NodeLocal DNSCache template #11757

merged 2 commits into from
Jun 16, 2021
+19 −1

Conversation

ederst
Copy link
Contributor

@ederst ederst commented Jun 14, 2021

Cherry pick of #11741 #11743 on release-1.21.

#11741: Compare OpenStack security groups deterministically
#11743: Make forwardToKubeDNS work in the NodeLocal DNSCache template

For details on the cherry pick process, see the cherry pick requests page.

ederst added 2 commits June 14, 2021 09:00
@ederst
Compare OpenStack security groups deterministically
24eafc2 
This sorts the security groups of the port model and when querying the
cloud, which will result in tasks comparing those slices
deterministically.
@ederst
Make forwardToKubeDNS work in the NodeLocal DNSCache template
812f263 
This fixes the rendering of the Corefile of the NodeLocal DNSCache
template when setting forwardToKubeDNS to false (or not setting it).

Previously, due to not dereferencing the bool pointer, the Corefile was
always rendered with the true clause, due to checking the address
instead of the actual value of the variable.

With this fix, the templating mechanism will actually respect the value
of forwardToKubeDNS and render it accordingly.
@k8s-ci-robot k8s-ci-robot added this to the v1.21 milestone Jun 14, 2021
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jun 14, 2021
@k8s-ci-robot
Copy link
Contributor

Hi @ederst. Thanks for your PR.

I'm waiting for a kubernetes 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.

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jun 14, 2021
@k8s-ci-robot k8s-ci-robot requested review from rdrgmnzs and zetaab June 14, 2021 07:01
@k8s-ci-robot k8s-ci-robot added area/addons area/provider/openstack Issues or PRs related to openstack provider labels Jun 14, 2021
@hakman
Copy link
Member

hakman commented Jun 14, 2021

/ok-to-test
/cc @olemarkus

@k8s-ci-robot k8s-ci-robot requested a review from olemarkus June 14, 2021 07:54
@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jun 14, 2021
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 16, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hakman

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 16, 2021
@k8s-ci-robot k8s-ci-robot merged commit 0ea4179 into kubernetes:release-1.21 Jun 16, 2021
ederst added a commit to infonova/kops that referenced this pull request Oct 13, 2021
@ederst
Add generated files for kubernetes#11784 and kubernetes#11757
f80d168
@ederst ederst mentioned this pull request Oct 13, 2021
Merged
github-actions bot added a commit to infonova/kops that referenced this pull request Oct 13, 2021
@github-actions
Merge pull request #35 from infonova/cherrypick-pr11784-pr11743-into-…
bcd3dd5 
…release-1.20-bp

Cherry pick PRs kubernetes#11784, kubernetes#11757 into release 1.20 bp
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hakman hakman hakman approved these changes

@rdrgmnzs rdrgmnzs Awaiting requested review from rdrgmnzs

@zetaab zetaab Awaiting requested review from zetaab

@olemarkus olemarkus Awaiting requested review from olemarkus

Assignees

@hakman hakman

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/addons area/provider/openstack Issues or PRs related to openstack provider cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
v1.21
Development

Successfully merging this pull request may close these issues.
3 participants
@ederst @k8s-ci-robot @hakman