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

[apm-server] fix podLabels #1521

Merged
merged 2 commits into from
Feb 2, 2022
Merged

[apm-server] fix podLabels #1521

merged 2 commits into from
Feb 2, 2022

Conversation

ebuildy
Copy link
Contributor

@ebuildy ebuildy commented Dec 25, 2021 •
edited
Loading

  • 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

pod labels were missing from APM template.

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

1 similar comment
@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?

jmlrt
jmlrt previously approved these changes Feb 2, 2022
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
Copy link
Member

jmlrt commented Feb 2, 2022

ok to test

jmlrt
jmlrt approved these changes Feb 2, 2022
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
Copy link
Member

jmlrt commented Feb 2, 2022

ok to test

@jmlrt jmlrt changed the title [APM] fix podLabels [apm-server] fix podLabels Feb 2, 2022
@jmlrt jmlrt merged commit 5b4f789 into elastic:main Feb 2, 2022
@jmlrt jmlrt mentioned this pull request Mar 1, 2022
Merged
jmlrt added a commit to jmlrt/helm-charts that referenced this pull request Mar 1, 2022
@ebuildy @jmlrt
[APM] fix podLabels (elastic#1521)
e8774e7 
* [APM] add podLabels

* format with black

Co-authored-by: jmlrt <8582351+jmlrt@users.noreply.github.com>
jmlrt added a commit that referenced this pull request Mar 1, 2022
@jmlrt @ebuildy
[APM] fix podLabels (#1521) (#1585)
1544828 
* [APM] add podLabels

* format with black

Co-authored-by: jmlrt <8582351+jmlrt@users.noreply.github.com>

Co-authored-by: Thomas Decaux <ebuildy@gmail.com>
@jmlrt jmlrt mentioned this pull request Mar 8, 2022
Merged
@jmlrt jmlrt added v7.17.1 and removed v7.17.0 labels Mar 8, 2022
@jmlrt jmlrt mentioned this pull request Mar 8, 2022
Merged
jmlrt added a commit to jmlrt/helm-charts that referenced this pull request Mar 8, 2022
@jmlrt
7.17.1 release changelog
09bac2a 
* 7.17.1 as default version.

| PR                                                        | Author                                       | Title                                                                   |
|-----------------------------------------------------------|----------------------------------------------|-------------------------------------------------------------------------|
| [elastic#1604](elastic#1604) | [@jmlrt](https://github.com/jmlrt)           | [meta] update docker images                                             |
| [elastic#1603](elastic#1603) | [@jmlrt](https://github.com/jmlrt)           | [metricbeat] add missing rolebinding and cluster role rules             |
| [elastic#1602](elastic#1602) | [@jmlrt](https://github.com/jmlrt)           | [filebeat] add missing rolebinding and cluster role rules               |
| [elastic#1593](elastic#1593) | [@jmlrt](https://github.com/jmlrt)           | [meta] add support for k8s 1.22                                         |
| [elastic#1582](elastic#1582) | [@jmlrt](https://github.com/jmlrt)           | [kibana] fix extra values default values                                |
| [elastic#1581](elastic#1581) | [@jmlrt](https://github.com/jmlrt)           | [logstash] fix ServiceAccount inconsistencies                           |
| [elastic#1580](elastic#1580) | [@jmlrt](https://github.com/jmlrt)           | [elasticsearch] fix ServiceAccount inconsistencies                      |
| [elastic#1570](elastic#1570) | [@jmlrt](https://github.com/jmlrt)           | [logstash] add externalTrafficPolicy support                            |
| [elastic#1569](elastic#1569) | [@jmlrt](https://github.com/jmlrt)           | [logstash] add flexible ingress                                         |
| [elastic#1563](elastic#1563) | [@jmlrt](https://github.com/jmlrt)           | [meta] bump Helm version to 3.8.0                                       |
| [elastic#1538](elastic#1538) | [@chetanv-oi](https://github.com/chetanv-oi) | [elasticsearch] move the yaml separator inside the condition            |
| [elastic#1530](elastic#1530) | [@jmlrt](https://github.com/jmlrt)           | [kibana] use bash for readiness script                                  |
| [elastic#1527](elastic#1527) | [@ebuildy](https://github.com/ebuildy)       | [apm-server] add pod labels                                             |
| [elastic#1524](elastic#1524) | [@beatkind](https://github.com/beatkind)     | [metricbeat] bump kube-state-metrics to version 4.7.0                   |
| [elastic#1521](elastic#1521) | [@ebuildy](https://github.com/ebuildy)       | [apm-server] fix podLabels                                              |
| [elastic#1494](elastic#1494) | [@ebuildy](https://github.com/ebuildy)       | [elasticsearch] add keystore container securityContext                  |
| [elastic#1450](elastic#1450) | [@dmarcs](https://github.com/dmarcs)         | [logstash] allow array values for extra                                 |
| [elastic#1422](elastic#1422) | [@framsouza](https://github.com/framsouza)   | [metricbeat] adding custerRole permissions for leader election          |
| [elastic#1420](elastic#1420) | [@framsouza](https://github.com/framsouza)   | [elasticsearch] [logstash] add support to PodDisruptionBudget policy/v1 |
| [elastic#1417](elastic#1417) | [@framsouza](https://github.com/framsouza)   | [kibana] add annotations at deployment level                            |
jmlrt added a commit that referenced this pull request Mar 8, 2022
@jmlrt
7.17.1 release changelog (#1610)
33a2829 
* 7.17.1 release changelog

* 7.17.1 as default version.

| PR                                                        | Author                                       | Title                                                                   |
|-----------------------------------------------------------|----------------------------------------------|-------------------------------------------------------------------------|
| [#1604](#1604) | [@jmlrt](https://github.com/jmlrt)           | [meta] update docker images                                             |
| [#1603](#1603) | [@jmlrt](https://github.com/jmlrt)           | [metricbeat] add missing rolebinding and cluster role rules             |
| [#1602](#1602) | [@jmlrt](https://github.com/jmlrt)           | [filebeat] add missing rolebinding and cluster role rules               |
| [#1593](#1593) | [@jmlrt](https://github.com/jmlrt)           | [meta] add support for k8s 1.22                                         |
| [#1582](#1582) | [@jmlrt](https://github.com/jmlrt)           | [kibana] fix extra values default values                                |
| [#1581](#1581) | [@jmlrt](https://github.com/jmlrt)           | [logstash] fix ServiceAccount inconsistencies                           |
| [#1580](#1580) | [@jmlrt](https://github.com/jmlrt)           | [elasticsearch] fix ServiceAccount inconsistencies                      |
| [#1570](#1570) | [@jmlrt](https://github.com/jmlrt)           | [logstash] add externalTrafficPolicy support                            |
| [#1569](#1569) | [@jmlrt](https://github.com/jmlrt)           | [logstash] add flexible ingress                                         |
| [#1563](#1563) | [@jmlrt](https://github.com/jmlrt)           | [meta] bump Helm version to 3.8.0                                       |
| [#1538](#1538) | [@chetanv-oi](https://github.com/chetanv-oi) | [elasticsearch] move the yaml separator inside the condition            |
| [#1530](#1530) | [@jmlrt](https://github.com/jmlrt)           | [kibana] use bash for readiness script                                  |
| [#1527](#1527) | [@ebuildy](https://github.com/ebuildy)       | [apm-server] add pod labels                                             |
| [#1524](#1524) | [@beatkind](https://github.com/beatkind)     | [metricbeat] bump kube-state-metrics to version 4.7.0                   |
| [#1521](#1521) | [@ebuildy](https://github.com/ebuildy)       | [apm-server] fix podLabels                                              |
| [#1494](#1494) | [@ebuildy](https://github.com/ebuildy)       | [elasticsearch] add keystore container securityContext                  |
| [#1450](#1450) | [@dmarcs](https://github.com/dmarcs)         | [logstash] allow array values for extra                                 |
| [#1422](#1422) | [@framsouza](https://github.com/framsouza)   | [metricbeat] adding custerRole permissions for leader election          |
| [#1420](#1420) | [@framsouza](https://github.com/framsouza)   | [elasticsearch] [logstash] add support to PodDisruptionBudget policy/v1 |
| [#1417](#1417) | [@framsouza](https://github.com/framsouza)   | [kibana] add annotations at deployment level                            |

* add breaking changes + update all toc instructions

* fix breaking change error
@jmlrt jmlrt mentioned this pull request Apr 21, 2022
Merged
This was referenced Sep 14, 2022
Merged
Merged
galina-tochilkin pushed a commit to mtp-devops/3d-party-helm that referenced this pull request Dec 20, 2022
@jmlrt
7.17.1 release changelog (#1610)
29f430a 
* 7.17.1 release changelog

* 7.17.1 as default version.

| PR                                                        | Author                                       | Title                                                                   |
|-----------------------------------------------------------|----------------------------------------------|-------------------------------------------------------------------------|
| [#1604](elastic/helm-charts#1604) | [@jmlrt](https://github.com/jmlrt)           | [meta] update docker images                                             |
| [#1603](elastic/helm-charts#1603) | [@jmlrt](https://github.com/jmlrt)           | [metricbeat] add missing rolebinding and cluster role rules             |
| [#1602](elastic/helm-charts#1602) | [@jmlrt](https://github.com/jmlrt)           | [filebeat] add missing rolebinding and cluster role rules               |
| [#1593](elastic/helm-charts#1593) | [@jmlrt](https://github.com/jmlrt)           | [meta] add support for k8s 1.22                                         |
| [#1582](elastic/helm-charts#1582) | [@jmlrt](https://github.com/jmlrt)           | [kibana] fix extra values default values                                |
| [#1581](elastic/helm-charts#1581) | [@jmlrt](https://github.com/jmlrt)           | [logstash] fix ServiceAccount inconsistencies                           |
| [#1580](elastic/helm-charts#1580) | [@jmlrt](https://github.com/jmlrt)           | [elasticsearch] fix ServiceAccount inconsistencies                      |
| [#1570](elastic/helm-charts#1570) | [@jmlrt](https://github.com/jmlrt)           | [logstash] add externalTrafficPolicy support                            |
| [#1569](elastic/helm-charts#1569) | [@jmlrt](https://github.com/jmlrt)           | [logstash] add flexible ingress                                         |
| [#1563](elastic/helm-charts#1563) | [@jmlrt](https://github.com/jmlrt)           | [meta] bump Helm version to 3.8.0                                       |
| [#1538](elastic/helm-charts#1538) | [@chetanv-oi](https://github.com/chetanv-oi) | [elasticsearch] move the yaml separator inside the condition            |
| [#1530](elastic/helm-charts#1530) | [@jmlrt](https://github.com/jmlrt)           | [kibana] use bash for readiness script                                  |
| [#1527](elastic/helm-charts#1527) | [@ebuildy](https://github.com/ebuildy)       | [apm-server] add pod labels                                             |
| [#1524](elastic/helm-charts#1524) | [@beatkind](https://github.com/beatkind)     | [metricbeat] bump kube-state-metrics to version 4.7.0                   |
| [#1521](elastic/helm-charts#1521) | [@ebuildy](https://github.com/ebuildy)       | [apm-server] fix podLabels                                              |
| [#1494](elastic/helm-charts#1494) | [@ebuildy](https://github.com/ebuildy)       | [elasticsearch] add keystore container securityContext                  |
| [#1450](elastic/helm-charts#1450) | [@dmarcs](https://github.com/dmarcs)         | [logstash] allow array values for extra                                 |
| [#1422](elastic/helm-charts#1422) | [@framsouza](https://github.com/framsouza)   | [metricbeat] adding custerRole permissions for leader election          |
| [#1420](elastic/helm-charts#1420) | [@framsouza](https://github.com/framsouza)   | [elasticsearch] [logstash] add support to PodDisruptionBudget policy/v1 |
| [#1417](elastic/helm-charts#1417) | [@framsouza](https://github.com/framsouza)   | [kibana] add annotations at deployment level                            |

* add breaking changes + update all toc instructions

* fix breaking change error
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 backported enhancement New feature or request v7.17.1
Projects
None yet
Milestone
No milestone
Development

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