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

correct spec.deployment.annotations #699

Merged
merged 2 commits into from
Mar 22, 2022

Conversation

Moulick
Copy link
Contributor

@Moulick Moulick commented Mar 9, 2022

add the spec.deployment.annotations in grafana CR to the grafana deployment

Signed-off-by: Moulick Aggarwal moulickaggarwal@gmail.com

Description

The spec.deployment.annotations are now also added to the grafana deployments in addition to pod template

Relevant issues/tickets

Closes #697

Type of change

  • Bug fix (non-breaking change which fixes an issue)

Checklist

  • Verified independently on a cluster by reviewer

Verification steps

  1. Create a grafana with any annotation to spec.deployment.annotations
  2. Check if the annotation is applied to the resulting grafana deployment

add the spec.deployment.annotations in grafana CR to the grafana deployment

Signed-off-by: Moulick Aggarwal <moulickaggarwal@gmail.com>
@Moulick
Copy link
Contributor Author

Moulick commented Mar 11, 2022

@pb82 could you approve to run the workflow here ?

@Moulick
Copy link
Contributor Author

Moulick commented Mar 15, 2022

I wonder, do we even need pod annotations anymore? Aren't they inherited from the deployment?

Pod annotations are not inherited from deployments. In my opinion, we should add a podAnnotations field and not reuse the spec.deployment.annotations to podTemplate

@Moulick
Copy link
Contributor Author

Moulick commented Mar 16, 2022

@pb82 if you agree, I can change the implementation accordingly to add a separate podAnnotation field.

@pb82
Copy link
Collaborator

pb82 commented Mar 22, 2022

@Moulick I think it's fine for now applying the same annotations to both.

@pb82 pb82 merged commit aa20ca0 into grafana:master Mar 22, 2022
@Moulick Moulick deleted the add-deployment-annotations branch March 22, 2022 12:54
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.

[Bug] missing annotations to grafana deployment
2 participants