Skip to content

[release-1.22] Feature: Add CoreDNS Customization Options #4479

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
Closed
wants to merge 3 commits into from
Closed

[release-1.22] Feature: Add CoreDNS Customization Options #4479

wants to merge 3 commits into from

Conversation

iwilltry42
Copy link
Collaborator

@iwilltry42 iwilltry42 commented Nov 12, 2021 •
edited
Loading

Backport of #4397

EDIT: OK, I'm super lost with the generated files that always cause conflicts here somehow can anyone give me a hint on how to avoid this? 🤔

@iwilltry42 iwilltry42 requested a review from a team as a code owner November 12, 2021 10:33
@iwilltry42 iwilltry42 mentioned this pull request Nov 12, 2021
Merged
@brandond
Copy link
Member

You basically need to run ./scripts/download && go generate on an Ubuntu host so that the gzip data matches what's produced by CI.

@iwilltry42
Copy link
Collaborator Author

You basically need to run ./scripts/download && go generate on an Ubuntu host so that the gzip data matches what's produced by CI.

I always did make generate, but I think that Go 1.17 which I have installed produces slightly different outputs (i.e. tags).

@brandond
Copy link
Member

ah yes, that too. You should definitely be running the same version as Go as we're using for any given branch.

@iwilltry42 iwilltry42 force-pushed the feat/release-1.22-coredns-custom-config branch from a295983 to d06e2e3 Compare November 24, 2021 13:02
@iwilltry42 iwilltry42 force-pushed the feat/release-1.22-coredns-custom-config branch from d06e2e3 to 12a2163 Compare December 17, 2021 16:38
@iwilltry42
Feature: Add CoreDNS Customization Options
c914c7d 
Problem:
Before, to customize CoreDNS, one had to edit the default configmap,
which gets re-written on every K3s server restart.

Solution:
Mount an additional coredns-custom configmap into the CoreDNS container
and import overrides and additional server blocks from the included
files.

Signed-off-by: Thorsten Klein <iwilltry42@gmail.com>
@iwilltry42 iwilltry42 force-pushed the feat/release-1.22-coredns-custom-config branch from 12a2163 to c914c7d Compare December 17, 2021 16:56
@iwilltry42
Copy link
Collaborator Author

@brandond can you please have a look or takeover here to finally get this ready?
I ran make generate in a golang:1.16.10-alpine3.13 (installed all tools listed in Dockerfile.dapper) container with the source directory mounted to ensure that my environment doesn't interfere.. but still it fails on the generated files 🤔

@dereknola
Merge remote-tracking branch 'origin/release-1.22' into feat/release-…
cf1871a 
…1.22-coredns-custom-config
@dereknola
go generate
788bf2e 
Signed-off-by: Derek Nola <derek.nola@suse.com>
@dereknola
Copy link
Member

Closing the PR, I have taken over this backport in a new PR, #4860 with rebase to current release-1.22.

@dereknola dereknola closed this Jan 3, 2022
@dereknola dereknola mentioned this pull request Jan 3, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@iwilltry42 @brandond @dereknola