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

Adds support for user specified Service annotations #2432

Merged
merged 5 commits into from
Nov 12, 2021

Conversation

rk295
Copy link
Contributor

@rk295 rk295 commented Nov 11, 2021

Description

Adds the ability to specify optional annotations to be applied to the Service resource within Kubernetes.

Fixes #2431

Checklist

  • Unit tests updated
  • End user documentation updated

@k8s-ci-robot k8s-ci-robot added do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Nov 11, 2021
@k8s-ci-robot
Copy link
Contributor

Welcome @rk295!

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/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Nov 11, 2021
@rk295 rk295 changed the title Adds support for user specified Service annotations (closes #2431) Adds support for user specified Service annotations Nov 11, 2021
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. label Nov 11, 2021
@stevehipwell
Copy link
Contributor

@rk295 thank for this PR. It looks like you need to update the chart version, I'd suggest a minor bump for added functionality, and the chart annotations to carry your changes before the CI will be able to pass.

@rk295
Copy link
Contributor Author

rk295 commented Nov 11, 2021

Thanks @stevehipwell I've bumped it to 1.6.0 - is that what you meant? And added my changes into the changes section.

@stevehipwell
Copy link
Contributor

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rk295, stevehipwell

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 Nov 11, 2021
@stevehipwell
Copy link
Contributor

/ok-to-test

@k8s-ci-robot k8s-ci-robot added the ok-to-test Indicates a non-member PR verified by an org member that is safe to test. label Nov 11, 2021
@stevehipwell
Copy link
Contributor

@Raffo it appears that I can't enable workflows for first time contributors?

@Raffo
Copy link
Contributor

Raffo commented Nov 12, 2021

@stevehipwell I think we would need repo admin to the repo and I don't manage that 😞

@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Nov 12, 2021
@rk295
Copy link
Contributor Author

rk295 commented Nov 12, 2021

@stevehipwell I know you had already approved, but this morning I realised I had not updated the README.md - just pushed a small commit documenting this new value. Hope that is ok!

@@ -45,6 +45,7 @@ The following table lists the configurable parameters of the _ExternalDNS_ chart
| `env` | [Environment variables](https://kubernetes.io/docs/tasks/inject-data-application/define-environment-variable-container/) for the _external-dns_ container, this supports the full [EnvVar](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.22/#envvar-v1-core) API including secrets and configmaps. | `[]` |
| `livenessProbe` | [Liveness probe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) for the _external-dns_ container, this supports the full [Probe](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.22/#probe-v1-core) API. | See _values.yaml_ |
| `readinessProbe` | [Readiness probe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) for the _external-dns_ container, this supports the full [Probe](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.22/#probe-v1-core) API. | See _values.yaml_ |
| `service.annotations` | Annotations to add to the service service. | `{}` |
Copy link
Contributor

Choose a reason for hiding this comment

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

Probably this should be

Annotations to add to the service.    

Copy link
Contributor Author

Choose a reason for hiding this comment

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

lol, slow morning is slow. Fixed now!

@stevehipwell
Copy link
Contributor

@stevehipwell I think we would need repo admin to the repo and I don't manage that 😞

As long as it's the expected behaviour that's fine.

@Raffo
Copy link
Contributor

Raffo commented Nov 12, 2021

As long as it's the expected behaviour that's fine.

I think it is. I think most of the kubernetes related projects use the internal google CI and we've been a bit operating independently and went with GitHub Actions which has advantages and disadvantages. I don't mind being pinged to approve the run by clicking on the button. It's a bit silly, but it's something we had to implement at GitHub (disclaimer: I'm an employee) to fight abuse.

@stevehipwell
Copy link
Contributor

It's a bit silly, but it's something we had to implement at GitHub (disclaimer: I'm an employee) to fight abuse.

I think it's a good idea, maybe Prow could make it so once someone has been approved in one org repo they're fixed in others, unless this is already the behaviour?

@Raffo
Copy link
Contributor

Raffo commented Nov 12, 2021

@stevehipwell the default behavior is that after the first contribution you get automatic approval. I think it's an okay tradeoff like that.

@stevehipwell
Copy link
Contributor

@Raffo I've approved this so do you want to add the LGTM?

@Raffo
Copy link
Contributor

Raffo commented Nov 12, 2021

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 12, 2021
@k8s-ci-robot k8s-ci-robot merged commit d389502 into kubernetes-sigs:master Nov 12, 2021
@stevehipwell
Copy link
Contributor

@Raffo I seem to have broken the release action with my previous PR, let me take a look and I'll see what's happened.

@stevehipwell
Copy link
Contributor

@rk295 this should have now been released.

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.

Cannot specify annotations on the service when using the helm chart
4 participants