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

Allow custom service names for controller and backend (#6457) #6469

Merged
merged 1 commit into from
Dec 6, 2020

Conversation

akonrath
Copy link
Contributor

What this PR does / why we need it:

Closes #6457 to allow for custom service names of the controller and backend to help transitions from nginx-ingress chart which allows this behavior. I set the defaults for these to be what the existing hardcoded values to prevent issues for existing deploys, however, if it's desired to make this into an if conditional for those two values, that's also possible.

I have also added in the values.yaml file to list that nameOverride and fullnameOverride are available.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Which issue/s this PR fixes

fixes #6457

How Has This Been Tested?

Tested locally with make build dev-env

Checklist:

  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I've read the CONTRIBUTION guide
  • I have added tests to cover my changes.
  • All new and existing tests passed.

@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.


  • If you've already signed a CLA, it's possible we don't have your GitHub username or you're using a different email address. Check your existing CLA data and verify that your email is set on your git commits.
  • If you signed the CLA as a corporation, please sign in with your organization's credentials at https://identity.linuxfoundation.org/projects/cncf to be authorized.
  • If you have done the above and are still having issues with the CLA being reported as unsigned, please log a ticket with the Linux Foundation Helpdesk: https://support.linuxfoundation.org/
  • Should you encounter any issues with the Linux Foundation Helpdesk, send a message to the backup e-mail support address at: [email protected]

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 Nov 12, 2020
@k8s-ci-robot
Copy link
Contributor

Welcome @akonrath!

It looks like this is your first PR to kubernetes/ingress-nginx 🎉. 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/ingress-nginx 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
Copy link
Contributor

Hi @akonrath. 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 Nov 12, 2020
@akonrath
Copy link
Contributor Author

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 Nov 12, 2020
@aledbf
Copy link
Member

aledbf commented Nov 14, 2020

/ok-to-test

@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 Nov 14, 2020
@aledbf
Copy link
Member

aledbf commented Nov 14, 2020

/assign @ChiefAlexander

@aledbf
Copy link
Member

aledbf commented Nov 21, 2020

@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Nov 24, 2020
@aledbf aledbf added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 24, 2020
@codecov-io
Copy link

codecov-io commented Nov 24, 2020

Codecov Report

Merging #6469 (3821512) into master (ca7db0e) will increase coverage by 0.01%.
The diff coverage is 52.12%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #6469      +/-   ##
==========================================
+ Coverage   55.81%   55.83%   +0.01%     
==========================================
  Files          89       91       +2     
  Lines        6358     6433      +75     
==========================================
+ Hits         3549     3592      +43     
- Misses       2369     2400      +31     
- Partials      440      441       +1     
Impacted Files Coverage Δ
cmd/nginx/main.go 4.23% <0.00%> (-0.07%) ⬇️
internal/ingress/controller/nginx.go 28.91% <ø> (ø)
internal/ingress/controller/status.go 0.00% <0.00%> (ø)
internal/k8s/zz_generated.deepcopy.go 0.00% <0.00%> (ø)
internal/ingress/controller/location.go 17.64% <17.64%> (ø)
...ternal/ingress/annotations/sessionaffinity/main.go 57.77% <28.57%> (ø)
internal/ingress/annotations/annotations.go 80.88% <33.33%> (ø)
internal/ingress/controller/controller.go 46.99% <33.33%> (+0.06%) ⬆️
internal/ingress/controller/store/store.go 58.94% <41.66%> (-0.11%) ⬇️
internal/ingress/controller/util.go 55.26% <50.00%> (-2.81%) ⬇️
... and 13 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e3a3ea8...4ec6b50. Read the comment docs.

@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Nov 24, 2020
@akonrath
Copy link
Contributor Author

@aledbf - I've bumped the version from 3.11.0 to 3.12.0. I can update the CHANGELOG.md from my end too, or if the maintainers handle that separately. Thanks!

@aledbf
Copy link
Member

aledbf commented Nov 24, 2020

I can update the CHANGELOG.md from my end too, or if the maintainers handle that separately. Thanks!

Yes, please update the changelog and also https://github.com/kubernetes/ingress-nginx/blob/master/charts/ingress-nginx/Chart.yaml#L23

Each PR that changes the version will publish a new release. The changelog and the artifact in artifacthub are updated with this information
https://artifacthub.io/packages/helm/ingress-nginx/ingress-nginx?modal=changelog

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 24, 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 Nov 25, 2020
@akonrath
Copy link
Contributor Author

@aledbf - Thank you. I've rebased and updated the CHANGELOG.md and Chart.yaml (3.13.0).

@aledbf aledbf removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 25, 2020
@aledbf
Copy link
Member

aledbf commented Nov 25, 2020

/approve
/hold

ping @ChiefAlexander

@k8s-ci-robot k8s-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Nov 25, 2020
@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 5, 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 Dec 5, 2020
@aledbf aledbf removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 6, 2020
@aledbf
Copy link
Member

aledbf commented Dec 6, 2020

/lgtm

@aledbf
Copy link
Member

aledbf commented Dec 6, 2020

@akonrath thanks!

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: akonrath, aledbf

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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. 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
Development

Successfully merging this pull request may close these issues.

Allow custom service names for controller and backend
5 participants