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

add --txt-suffix feature #1483

Merged
merged 6 commits into from
May 21, 2020
Merged

add --txt-suffix feature #1483

merged 6 commits into from
May 21, 2020

Conversation

jgrumboe
Copy link
Contributor

@jgrumboe jgrumboe commented Apr 2, 2020

This PR solves #1482
It adds a new --txt-suffix feature which creates TXT-records where the suffix is appended to the host portion of the DNSName.
Example:
DNSName test.example.com
txt-suffix: "-txt"
TXT-record generated: test-txt.example.com

This gives a cleaner overview in alphabetically sorted DNS management GUIs.

@k8s-ci-robot
Copy link
Contributor

Thanks for your pull request. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please follow instructions at https://git.k8s.io/community/CLA.md#the-contributor-license-agreement to sign the CLA.

It may take a couple minutes for the CLA signature to be fully registered; after that, please reply here with a new comment and we'll verify. Thanks.

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. I understand the commands that are listed here.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. label Apr 2, 2020
@k8s-ci-robot
Copy link
Contributor

Welcome @jgrumboe!

It looks like this is your first PR to kubernetes-sigs/external-dns 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/external-dns has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Apr 2, 2020
@jgrumboe
Copy link
Contributor Author

jgrumboe commented Apr 2, 2020

I signed it

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Apr 2, 2020
@jgrumboe
Copy link
Contributor Author

jgrumboe commented Apr 2, 2020

/assign @hjacobs

@jgrumboe
Copy link
Contributor Author

jgrumboe commented Apr 7, 2020

/assign @Raffo

@jgrumboe
Copy link
Contributor Author

jgrumboe commented Apr 9, 2020 •
edited
Loading

Just for clarification:
I renamed the prefixNameMapper to affixNameMapper, because "affix" is the general word for adding something to the base form of a word. (https://www.lexico.com/en/definition/affix)
So I was able to use the same Mapper for prefix and suffix.

@ruudk ruudk mentioned this pull request Apr 10, 2020
Closed
ruudk
ruudk reviewed Apr 10, 2020
View reviewed changes
registry/txt.go Outdated
Comment on lines 220 to 230
/* func (pr affixNameMapper) toEndpointName(txtDNSName string) string {
lowerDNSName := strings.ToLower(txtDNSName)
if strings.HasPrefix(lowerDNSName, pr.prefix) {
regex := regexp.MustCompile(`\.`)
DNSName := regex.Split(lowerDNSName, 2)
if (strings.HasPrefix(DNSName[0], pr.prefix) && strings.HasSuffix(DNSName[0], pr.suffix)) {
DNSName[0] = strings.TrimPrefix(DNSName[0], pr.prefix)
DNSName[0] = strings.TrimSuffix(DNSName[0], pr.suffix)
return DNSName[0] + "." + DNSName[1]
}
return ""
}*/
Copy link

Choose a reason for hiding this comment

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

I think the commented code should be removed.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You're right. Missed this one after testing.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@ruudk Done

@jgrumboe
Copy link
Contributor Author

Any news?
If someone wants to test it, just pull docker.io/porscheinformatik/external-dns:latest (it's based on 0.7.1)

@jgrumboe
Copy link
Contributor Author

@njuettner @Raffo @hjacobs
Is there anything else you need to get this merged?

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 11, 2020
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 12, 2020
@Raffo Raffo linked an issue May 16, 2020 that may be closed by this pull request
New --txt-suffix option to do suffixes instead of prefixes for TXT records #1482
Closed
Raffo
Raffo reviewed May 16, 2020
View reviewed changes
registry/txt.go Outdated Show resolved Hide resolved
registry/txt.go Outdated Show resolved Hide resolved
@Raffo
Copy link
Contributor

Raffo commented May 21, 2020

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 21, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jgrumboe, Raffo

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 May 21, 2020
@k8s-ci-robot k8s-ci-robot merged commit 8387c93 into kubernetes-sigs:master May 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ruudk ruudk ruudk left review comments

@Raffo Raffo Raffo left review comments

@njuettner njuettner Awaiting requested review from njuettner

Assignees

@hjacobs hjacobs

@Raffo Raffo

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

New --txt-suffix option to do suffixes instead of prefixes for TXT records
5 participants
@jgrumboe @k8s-ci-robot @Raffo @ruudk @hjacobs