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

add ability to set pod annotations for injector #394

Merged

Conversation

mrparkers
Copy link
Contributor

@mrparkers mrparkers commented Sep 30, 2020

this PR adds the ability to add pod annotations to the injector pod. our use case for this is that we want to install Vault within an Istio enabled namespace and join Vault to the mesh, but we don't want to join the injector pod to the mesh. so we need to specify pod annotations to exclude it.

@hashicorp-cla
Copy link

hashicorp-cla commented Sep 30, 2020

CLA assistant check
All committers have signed the CLA.

@jasonodonnell
Copy link
Contributor

Thanks for the contribution @mrparkers!

Can you add unit tests so we have coverage on this? The unit tests would go here: https://github.com/hashicorp/vault-helm/blob/master/test/unit/injector-deployment.bats

You can basically copy/modify existing annotation tests: https://github.com/hashicorp/vault-helm/blob/master/test/unit/server-statefulset.bats#L903-L932.

Let me know if you have any questions!

@mrparkers
Copy link
Contributor Author

Sorry for missing that @jasonodonnell, I just pushed up a commit with those missing tests.

@jasonodonnell jasonodonnell self-requested a review October 1, 2020 15:06
Copy link
Contributor

@jasonodonnell jasonodonnell left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@jasonodonnell jasonodonnell merged commit 1968526 into hashicorp:master Oct 1, 2020
@mrparkers mrparkers deleted the add-injector-pod-annotations branch October 1, 2020 15:15
@jasonodonnell jasonodonnell mentioned this pull request Oct 20, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants