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

[8.12](backport #2356) Upgrade helm to v3.14.2 #2447

Closed
wants to merge 3 commits into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Aug 20, 2024

Summary of your changes

In order to handle CVE-2024-26147, we are required to bump helm version.
Decided to remove the PSP fetching (left the rules) in order to bump the helm, elastic-agent-autodiscover, k8s apis.
After this PR we should handle the PSP case scenario correctly and deliver a hotfix (backport) in order to support it fully.

Related Issues

Related:

Checklist

  • I have added tests that prove my fix is effective or that my feature works
  • I have added the necessary README/documentation (if appropriate)

Introducing a new rule?


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

* Bump helm

* Disable PSP feature leave rules

* Bumping elastic-agent-autodiscover

* Lint fixes

* Linter empty space

* Commenting out CI tests and removing codeblocks from core code

* Comment out EKS PSP

* Remove imports from CI tests

* Update rules coverage

(cherry picked from commit 0029a1a)

# Conflicts:
#	.github/workflows/ci.yml
#	go.mod
#	go.sum
#	resources/fetching/fetchers/k8s/kube_fetcher_test.go
#	resources/fetching/fetchers/k8s/kube_provider.go
#	security-policies/RULES.md
#	tests/product/tests/data/k8s/k8s_object_cases.py
#	tests/product/tests/data/k8s_object/eks_k8s_object_test_cases.py
#	tests/test_environments/k8s-objects-all-cases.yml
@mergify mergify bot requested a review from a team as a code owner August 20, 2024 07:24
Copy link
Author

mergify bot commented Aug 20, 2024

Cherry-pick of 0029a1a has failed:

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

You are currently cherry-picking commit 0029a1ad.
  (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/k8s/fleet-managed-agent.yml
	modified:   deploy/k8s/standalone-agent.yml
	modified:   deploy/kustomize/base/role.yml
	modified:   deploy/kustomize/overlays/cloudbeat-vanilla-agent/manifests.yaml
	modified:   tests/commonlib/kubernetes.py
	modified:   tests/deploy/k8s-cloudbeat-tests/templates/cloudbeat-eks-pytest.yaml
	modified:   tests/deploy/k8s-cloudbeat-tests/templates/standalone-agent.yml
	modified:   tests/deploy/mock-pod.yml
	modified:   tests/deploy/sa-agent-pytest.yml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .github/workflows/ci.yml
	both modified:   go.mod
	both modified:   go.sum
	both modified:   resources/fetching/fetchers/k8s/kube_fetcher_test.go
	both modified:   resources/fetching/fetchers/k8s/kube_provider.go
	both modified:   security-policies/RULES.md
	deleted by us:   tests/product/tests/data/k8s/k8s_object_cases.py
	both modified:   tests/product/tests/data/k8s_object/eks_k8s_object_test_cases.py
	deleted by us:   tests/test_environments/k8s-objects-all-cases.yml

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

@orouz orouz assigned orouz and unassigned jeniawhite Aug 20, 2024
@orouz orouz closed this Aug 20, 2024
@mergify mergify bot deleted the mergify/bp/8.12/pr-2356 branch August 20, 2024 08:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants