Skip to content
This repository has been archived by the owner on May 16, 2023. It is now read-only.

Fix serviceAccount for APM server #786

Merged
merged 1 commit into from
Aug 27, 2020
Merged

Fix serviceAccount for APM server #786

merged 1 commit into from
Aug 27, 2020

Conversation

caiconkhicon
Copy link
Contributor

@caiconkhicon caiconkhicon commented Aug 17, 2020 •
edited
Loading

Why

  • In the current Helm chart for apm-server, serviceAccount for the
    Deployment is only set when serviceAccount is set in values.yaml.
    However, it is wrong. serviceAccount should always be set because even
    when no serviceAccount is set in values.yaml, a managed one is still
    created.

What

  • Always set serviceAccount for apm-server Deployment to the template
    apm.serviceAccount defined in _helpers.tpl

  • Chart version not bumped (the versions are all bumped and released at the same time)

  • README.md updated with any new values or changes

  • Updated template tests in ${CHART}/tests/*.py

  • Updated integration tests in ${CHART}/examples/*/test/goss.yaml

@elasticmachine
Copy link
Collaborator

Since this is a community submitted pull request, a Jenkins build has not been kicked off automatically. Can an Elastic organization member please verify the contents of this patch and then kick off a build manually?

@cla-checker-service
Copy link

cla-checker-service bot commented Aug 17, 2020 •
edited
Loading

💚 CLA has been signed

@jmlrt jmlrt added apm-server bug Something isn't working labels Aug 25, 2020
@jmlrt
Copy link
Member

jmlrt commented Aug 25, 2020

cla/check

@jmlrt
Copy link
Member

jmlrt commented Aug 25, 2020

Hi @caiconkhicon,
Thanks for your PR.
Can you sign the CLA: https://www.elastic.co/contributor-agreement

@caiconkhicon
Copy link
Contributor Author

caiconkhicon commented Aug 25, 2020 •
edited
Loading

@jmlrt : Yes I did that, I also downloaded the PDF, the UI shows:

You're All Done!
You'll receive a copy once everyone has signed.

What else do I need to do?

@jmlrt
Copy link
Member

jmlrt commented Aug 27, 2020

cla/check

@jmlrt
Copy link
Member

jmlrt commented Aug 27, 2020

Can you confirm that you signed the CLA with the same email that you used in your commit?

@jmlrt
Copy link
Member

jmlrt commented Aug 27, 2020

cla/check

@jmlrt
Copy link
Member

jmlrt commented Aug 27, 2020

jenkins test this please

@caiconkhicon
Copy link
Contributor Author

Can you confirm that you signed the CLA with the same email that you used in your commit?

@jmlrt : I guess it works now?

@jmlrt
Copy link
Member

jmlrt commented Aug 27, 2020

@caiconkhicon Can you merge master on your branch?

@caiconkhicon
Copy link
Contributor Author

caiconkhicon commented Aug 27, 2020 •
edited
Loading

@caiconkhicon Can you merge master on your branch?

Sorry I don't get what you mean. You mean rebase master on my branch? I can do it now.
Done!

@caiconkhicon
Why
8b6a904 
----
- In the current Helm chart for `apm-server`, serviceAccount for the
Deployment is only set when `serviceAccount` is set in `values.yaml`.
However, it is wrong. `serviceAccount` should always be set because even
when no `serviceAccount` is set in `values.yaml`, a managed one is still
created.

What
----
- Always set `serviceAccount` for apm-server Deployment to the template
apm.serviceAccount defined in `_helpers.tpl`
@jmlrt
Copy link
Member

jmlrt commented Aug 27, 2020

jenkins test this please

jmlrt
jmlrt approved these changes Aug 27, 2020
View reviewed changes
Copy link
Member

@jmlrt jmlrt left a comment

Choose a reason for hiding this comment

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

LGTM⛴

@jmlrt jmlrt merged commit 6312f9e into elastic:master Aug 27, 2020
jmlrt pushed a commit that referenced this pull request Aug 27, 2020
@caiconkhicon @jmlrt
Fix serviceAccount for APM server (#786)
a3d081f
jmlrt pushed a commit that referenced this pull request Aug 27, 2020
@caiconkhicon @jmlrt
Fix serviceAccount for APM server (#786)
0452078
jmlrt pushed a commit that referenced this pull request Aug 27, 2020
@caiconkhicon @jmlrt
Fix serviceAccount for APM server (#786)
acfe3cd
@jmlrt
Copy link
Member

jmlrt commented Aug 27, 2020 •
edited
Loading

backported to 6.8, 7.9 and 7.x branches

@jmlrt jmlrt mentioned this pull request Sep 3, 2020
Merged
@elasticmachine elasticmachine mentioned this pull request Oct 21, 2020
Merged
@jmlrt jmlrt mentioned this pull request Oct 28, 2020
Closed
This was referenced Nov 17, 2020
Closed
Closed
Closed
Closed
@elasticmachine elasticmachine mentioned this pull request Nov 20, 2020
Closed
@jmlrt jmlrt mentioned this pull request Nov 23, 2020
Closed
@elasticmachine elasticmachine mentioned this pull request Nov 23, 2020
Merged
@jmlrt jmlrt mentioned this pull request Feb 8, 2021
Closed
This was referenced Mar 15, 2021
Closed
Closed
@jmlrt jmlrt mentioned this pull request May 25, 2021
Closed
This was referenced Dec 14, 2021
Merged
Merged
Merged
@jmlrt jmlrt mentioned this pull request Mar 8, 2022
Merged
@jmlrt jmlrt mentioned this pull request Apr 21, 2022
Merged
This was referenced Sep 14, 2022
Merged
Merged
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@jmlrt jmlrt jmlrt approved these changes

Assignees
No one assigned
Labels
apm-server bug Something isn't working v6.8.13 v7.9.1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@caiconkhicon @elasticmachine @jmlrt