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

Configure dnsTrustedServers correctly for RKE2 #2181

Merged
merged 2 commits into from
Sep 21, 2022
Merged

Configure dnsTrustedServers correctly for RKE2 #2181

merged 2 commits into from
Sep 21, 2022

Conversation

nelljerram
Copy link
Member

@nelljerram nelljerram commented Sep 20, 2022

The default for dnsTrustedServers assumes that the DNS service is named kube-dns. On RKE2 a different name is used. Note, we already have a similar special case for OpenShift.

For PR author

  • Tests for change.
  • If changing pkg/apis/, run make gen-files
  • If changing versions, run make gen-versions

For PR reviewers

A note for code reviewers - all pull requests must have the following:

  • Milestone set according to targeted release.
  • Appropriate labels:
    • kind/bug if this is a bugfix.
    • kind/enhancement if this is a a new feature.
    • enterprise if this PR applies to Calico Enterprise only.

@tmjd
Copy link
Member

tmjd commented Sep 20, 2022

Looks good, I'd like to see a test for this case.

@nelljerram nelljerram added kind/bug Something isn't working enterprise Feature applies to enterprise only docs-not-required and removed docs-pr-required labels Sep 20, 2022
Copy link
Member

@tmjd tmjd left a comment

Choose a reason for hiding this comment

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

LGTM

@tmjd tmjd merged commit e986d14 into master Sep 21, 2022
@caseydavenport caseydavenport deleted the rke2-dns-config branch November 1, 2022 17:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docs-not-required enterprise Feature applies to enterprise only kind/bug Something isn't working release-note-required
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants