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

[metricbeat] use deprecated kube-state-metrics config when existing #624

Merged
merged 11 commits into from
May 28, 2020

Conversation

jmlrt
Copy link
Member

@jmlrt jmlrt commented May 15, 2020

Fix #623

  • 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

@jmlrt jmlrt added bug Something isn't working metricbeat v7.7.1 labels May 15, 2020
@jmlrt jmlrt requested review from Crazybus and a team May 15, 2020 18:11
Conky5
Conky5 previously approved these changes May 15, 2020
Copy link
Contributor

@Conky5 Conky5 left a comment

Choose a reason for hiding this comment

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

LGTM

metricbeat/templates/deployment.yaml Outdated Show resolved Hide resolved
@jmlrt
Copy link
Member Author

jmlrt commented May 20, 2020

jenkins test this please

@Conky5
Copy link
Contributor

Conky5 commented May 20, 2020

Helm isn't liking this character it seems
https://devops-ci.elastic.co/job/elastic+helm-charts+pull-request+template-testing/609/CHART=metricbeat,label=docker&&virtual/console

[ERROR] templates/: parse error in "metricbeat/templates/deployment.yaml": template: metricbeat/templates/deployment.yaml:75: bad character U+002D '-'

jmlrt and others added 8 commits May 28, 2020 00:36
Co-authored-by: Michael Russell <Crazybus@users.noreply.github.com>
…c.selector.matchLabels (elastic#622)

This fix metricbeat chart upgrades when .Chart.Version change.

UPGRADE FAILED
Error: Deployment.apps "metricbeat-metricbeat-metrics" is invalid: spec.selector: Invalid value: v1.LabelSelector{MatchLabels:map[string]string{"app":"metricbeat-metricbeat-metrics", "chart":"metricbeat-7.7.0", "heritage":"Tiller", "release":"metricbeat"}, MatchExpressions:[]v1.LabelSelectorRequirement(nil)}: field is immutable
Error: UPGRADE FAILED: Deployment.apps "metricbeat-metricbeat-metrics" is invalid: spec.selector: Invalid value: v1.LabelSelector{MatchLabels:map[string]string{"app":"metricbeat-metricbeat-metrics", "chart":"metricbeat-7.7.0", "heritage":"Tiller", "release":"metricbeat"}, MatchExpressions:[]v1.LabelSelectorRequirement(nil)}: field is immutable

See helm/charts#7680 for more details
@jmlrt jmlrt force-pushed the metricbeat-fix-deployment-config-upgrade branch from cf83c61 to 4689c0c Compare May 27, 2020 22:38
@jmlrt jmlrt added the v6.8.10 label May 27, 2020
…ricbeat.yml value

This is requires because helm doesn't support accessing values with dash in the name (see helm/helm#2192 for more details).
@jmlrt
Copy link
Member Author

jmlrt commented May 28, 2020

Helm isn't liking this character it seems
https://devops-ci.elastic.co/job/elastic+helm-charts+pull-request+template-testing/609/CHART=metricbeat,label=docker&&virtual/console

[ERROR] templates/: parse error in "metricbeat/templates/deployment.yaml": template: metricbeat/templates/deployment.yaml:75: bad character U+002D '-'

This was really tricky but it's fixed by 235e4e4 (see helm/helm#2192 for more details).

@jmlrt
Copy link
Member Author

jmlrt commented May 28, 2020

@Crazybus, this is fixed now. Can you recheck 🙏 ?

Copy link
Contributor

@Crazybus Crazybus 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 5525142 into elastic:master May 28, 2020
@jmlrt jmlrt deleted the metricbeat-fix-deployment-config-upgrade branch May 28, 2020 15:37
jmlrt added a commit that referenced this pull request May 28, 2020
…624)

This commit fix a bug introduced in #572 where Metricbeat deployment doesn't start after an upgrade from a previous version when using a custom metricbeatConfig.
jmlrt added a commit that referenced this pull request May 28, 2020
…624)

This commit fix a bug introduced in #572 where Metricbeat deployment doesn't start after an upgrade from a previous version when using a custom metricbeatConfig.
jmlrt added a commit that referenced this pull request May 28, 2020
…624)

This commit fix a bug introduced in #572 where Metricbeat deployment doesn't start after an upgrade from a previous version when using a custom metricbeatConfig.
This was referenced Jun 3, 2020
@jmlrt jmlrt mentioned this pull request Oct 28, 2020
This was referenced Nov 17, 2020
@jmlrt jmlrt mentioned this pull request Feb 8, 2021
This was referenced Mar 15, 2021
@jmlrt jmlrt mentioned this pull request May 25, 2021
@jmlrt jmlrt mentioned this pull request Mar 8, 2022
@jmlrt jmlrt mentioned this pull request Apr 21, 2022
This was referenced Sep 14, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Metricbeat deployment doesn't start after upgrade using custom metricbeatConfig
6 participants