dns-controller: always apply the addon, empty when unused#18567
Merged
kubernetes-prow[bot] merged 1 commit intoJul 10, 2026
Conversation
kubernetes-prow
Bot
added
size/XL
When a cluster does not use dns-controller (dns=none topology or the external-dns provider), the dns-controller addon was dropped from the bootstrap channel entirely. Channels never prunes addons that are no longer in the channel, so clusters migrating from gossip to dns=none were left with an orphaned dns-controller deployment that had to be deleted manually. Keep applying the dns-controller addon on every cluster, as a tombstone with an empty manifest and prune directives when it is unused, so that any previously deployed dns-controller resources are cleaned up automatically.
hakman
force-pushed
the
dns-controller-none-dns
branch
from
b6b8ed9 to
35354f2
Compare
Member
Author
|
/retest |
rifelpet
approved these changes
Jul 10, 2026
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: rifelpet The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
kubernetes-prow
Bot
added
approved
hakman
added a commit
to hakman/kops
that referenced
this pull request
Jul 10, 2026
The cherry-pick of kubernetes#18567 carried master's aws-cloud-controller manifestHash into the new dns-none bootstrapchannelbuilder golden. On release-1.36 the aws-cloud-controller addon manifest differs, so the embedded hash did not match, failing TestBootstrapChannelBuilder_BuildTasks. Regenerate the golden against release-1.36 so the hash matches.
kubernetes-prow Bot
added a commit
that referenced
this pull request
Jul 10, 2026
…-upstream-release-1.36 Automated cherry pick of #18567: dns-controller: always apply the addon, empty when unused
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
When a cluster does not use dns-controller (dns=none topology or the external-dns provider), the dns-controller addon was dropped from the bootstrap channel entirely. Channels never prunes addons that are no longer in the channel, so clusters migrating from gossip to dns=none were left with an orphaned dns-controller deployment that had to be deleted manually.
Keep applying the dns-controller addon on every cluster, with an empty manifest and prune directives when it is unused, so that any previously deployed dns-controller resources are cleaned up automatically.
/cc @rifelpet @ameukam