Skip to content

[8.19] (backport #9165) helm: update ksm to 6.1.0 for elastic-agent chart#9185

Merged
pkoutsovasilis merged 3 commits into8.19from
mergify/bp/8.19/pr-9165
Aug 1, 2025
Merged

[8.19] (backport #9165) helm: update ksm to 6.1.0 for elastic-agent chart#9185
pkoutsovasilis merged 3 commits into8.19from
mergify/bp/8.19/pr-9165

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jul 30, 2025

What does this PR do?

This PR upgrades the kube-state-metrics Helm chart dependency in the elastic-agent Helm chart from version 5.30.1 to 6.1.0.

Why is it important?

  • Keeps the dependency up to date with the latest features, metrics, and security patches.
  • Reduces the risk of drift from the upstream Prometheus Helm charts.

Checklist

  • I have read and understood the pull request guidelines of this project.
  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in ./changelog/fragments using the changelog tool
  • I have added an integration test or an E2E test

Disruptive User Impact

None expected. This is a version bump within the supported range and does not introduce breaking changes in the Helm chart interface.

How to test this PR locally

helm install -n kube-system elastic-agent ./deploy/helm/elastic-agent ...

Related issues

  • N/A

This is an automatic backport of pull request #9165 done by [Mergify](https://mergify.com).

(cherry picked from commit b878906)

# Conflicts:
#	deploy/helm/elastic-agent/examples/kubernetes-onboarding/rendered/manifest.yaml
@mergify mergify bot requested a review from a team as a code owner July 30, 2025 12:27
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jul 30, 2025
@mergify mergify bot removed the request for review from a team July 30, 2025 12:27
@mergify mergify bot added the backport label Jul 30, 2025
@mergify mergify bot requested review from blakerouse and kaanyalti July 30, 2025 12:27
@mergify
Copy link
Contributor Author

mergify bot commented Jul 30, 2025

Cherry-pick of b878906 has failed:

On branch mergify/bp/8.19/pr-9165
Your branch is up to date with 'origin/8.19'.

You are currently cherry-picking commit b878906d0.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   deploy/helm/elastic-agent/Chart.lock
	modified:   deploy/helm/elastic-agent/Chart.yaml
	modified:   deploy/helm/elastic-agent/charts/kube-state-metrics/Chart.yaml
	modified:   deploy/helm/elastic-agent/charts/kube-state-metrics/README.md
	modified:   deploy/helm/elastic-agent/charts/kube-state-metrics/templates/_helpers.tpl
	modified:   deploy/helm/elastic-agent/charts/kube-state-metrics/templates/crs-configmap.yaml
	modified:   deploy/helm/elastic-agent/charts/kube-state-metrics/templates/deployment.yaml
	modified:   deploy/helm/elastic-agent/charts/kube-state-metrics/templates/pdb.yaml
	deleted:    deploy/helm/elastic-agent/charts/kube-state-metrics/templates/podsecuritypolicy.yaml
	deleted:    deploy/helm/elastic-agent/charts/kube-state-metrics/templates/psp-clusterrole.yaml
	deleted:    deploy/helm/elastic-agent/charts/kube-state-metrics/templates/psp-clusterrolebinding.yaml
	modified:   deploy/helm/elastic-agent/charts/kube-state-metrics/templates/role.yaml
	new file:   deploy/helm/elastic-agent/charts/kube-state-metrics/templates/scrapeconfig.yaml
	modified:   deploy/helm/elastic-agent/charts/kube-state-metrics/templates/service.yaml
	modified:   deploy/helm/elastic-agent/charts/kube-state-metrics/values.yaml
	modified:   deploy/helm/elastic-agent/examples/eck/rendered/manifest.yaml
	modified:   deploy/helm/elastic-agent/examples/fleet-managed-certificates/rendered/manifest.yaml
	modified:   deploy/helm/elastic-agent/examples/fleet-managed-ksm-sharding/rendered/manifest.yaml
	modified:   deploy/helm/elastic-agent/examples/fleet-managed/rendered/manifest.yaml
	modified:   deploy/helm/elastic-agent/examples/kubernetes-custom-output/rendered/manifest.yaml
	modified:   deploy/helm/elastic-agent/examples/kubernetes-default/rendered/manifest.yaml
	modified:   deploy/helm/elastic-agent/examples/kubernetes-hints-autodiscover/rendered/manifest.yaml
	modified:   deploy/helm/elastic-agent/examples/kubernetes-ksm-sharding/rendered/manifest.yaml
	modified:   deploy/helm/elastic-agent/examples/multiple-integrations/rendered/manifest.yaml
	modified:   deploy/helm/elastic-agent/examples/priority-class/rendered/manifest.yaml
	modified:   deploy/helm/elastic-agent/examples/user-service-account/rendered/manifest.yaml
	modified:   magefile.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   deploy/helm/elastic-agent/examples/kubernetes-onboarding/rendered/manifest.yaml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@github-actions github-actions bot added Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team skip-changelog labels Jul 30, 2025
@elasticmachine
Copy link
Contributor

Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane)

@pkoutsovasilis
Copy link
Contributor

I will wait for this PR #8672 to go in first and then merge this one 🙂

@pkoutsovasilis pkoutsovasilis removed the conflicts There is a conflict in the backported pull request label Jul 30, 2025
@elastic-sonarqube
Copy link

Quality Gate passed Quality Gate passed

Issues
0 New issues
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarQube

@elasticmachine
Copy link
Contributor

💚 Build Succeeded

History

cc @pkoutsovasilis

Copy link
Contributor

@pkoutsovasilis pkoutsovasilis left a comment

Choose a reason for hiding this comment

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

I lied the release PR doesn't have any conflicts (either actual or indirect version ones) with this one

@pkoutsovasilis pkoutsovasilis merged commit 58a4c01 into 8.19 Aug 1, 2025
19 checks passed
@pkoutsovasilis pkoutsovasilis deleted the mergify/bp/8.19/pr-9165 branch August 1, 2025 13:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants