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.17](backport #6724) [k8s] Correct agent image repository #6851

Merged
merged 5 commits into from
Feb 14, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 13, 2025

What does this PR do?

This PR updates the registry of the elastic-agent container image to reflect the latest and correct one

Why is it important?

It is mandatory as elastic-agent container image has migrated to docker.elastic.co/elastic-agent/

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

How to test this PR locally

Follow either one of the elastic-agent Helm chart examples

Related issues

Closes #6725


This is an automatic backport of pull request #6724 done by Mergify.

* fix: correct agent image repository

* fix: update agent image repository in more places

* fix default docker image repository

---------

Co-authored-by: Paolo Chila <paolo.chila@elastic.co>
(cherry picked from commit ed7c19f)

# Conflicts:
#	deploy/helm/edot-collector/kube-stack/values.yaml
#	deploy/helm/elastic-agent/examples/eck/rendered/manifest.yaml
#	deploy/helm/elastic-agent/examples/fleet-managed-ksm-sharding/rendered/manifest.yaml
#	deploy/helm/elastic-agent/examples/fleet-managed/rendered/manifest.yaml
#	deploy/helm/elastic-agent/examples/kubernetes-default/rendered/manifest.yaml
#	deploy/helm/elastic-agent/examples/kubernetes-hints-autodiscover/rendered/manifest.yaml
#	deploy/helm/elastic-agent/examples/kubernetes-ksm-sharding/rendered/manifest.yaml
#	deploy/helm/elastic-agent/examples/kubernetes-only-logs/rendered/manifest.yaml
#	deploy/helm/elastic-agent/examples/multiple-integrations/rendered/manifest.yaml
#	deploy/helm/elastic-agent/examples/netflow-service/rendered/manifest.yaml
#	deploy/helm/elastic-agent/examples/nginx-custom-integration/rendered/manifest.yaml
#	deploy/helm/elastic-agent/examples/system-custom-auth-paths/rendered/manifest.yaml
#	deploy/helm/elastic-agent/examples/user-cluster-role/rendered/manifest.yaml
#	deploy/helm/elastic-agent/examples/user-service-account/rendered/manifest.yaml
#	deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml
#	deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml
#	deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml
#	deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-managed/extra/elastic-agent-managed-statefulset.yaml
#	deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml
#	deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/extra/elastic-agent-standalone-statefulset.yaml
#	deploy/kubernetes/elastic-agent-kustomize/ksm-hints/elastic-agent-standalone/kustomization.yaml
#	deploy/kubernetes/elastic-agent-managed-kubernetes.yaml
#	deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml
@mergify mergify bot requested a review from a team as a code owner February 13, 2025 11:07
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Feb 13, 2025
@mergify mergify bot requested review from andrzej-stencel and michel-laterman and removed request for a team February 13, 2025 11:07
Copy link
Contributor Author

mergify bot commented Feb 13, 2025

Cherry-pick of ed7c19f has failed:

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

You are currently cherry-picking commit ed7c19f3b.
  (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/README.md
	modified:   deploy/helm/elastic-agent/values.yaml
	modified:   deploy/kubernetes/elastic-agent-kustomize/ksm-hints/elastic-agent-standalone/kustomization.yaml.original
	modified:   deploy/kubernetes/elastic-agent-managed/elastic-agent-managed-daemonset.yaml
	modified:   deploy/kubernetes/elastic-agent-standalone/elastic-agent-standalone-daemonset.yaml
	modified:   dev-tools/packaging/packages.yml
	modified:   docs/local-k8s-testing.md
	modified:   internal/pkg/otel/README.md
	modified:   internal/pkg/otel/templates/README.md.tmpl
	modified:   pkg/testing/kubernetes/supported.go
	modified:   skaffold.yaml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   deploy/helm/edot-collector/kube-stack/values.yaml
	both modified:   deploy/helm/elastic-agent/examples/eck/rendered/manifest.yaml
	deleted by us:   deploy/helm/elastic-agent/examples/fleet-managed-ksm-sharding/rendered/manifest.yaml
	both modified:   deploy/helm/elastic-agent/examples/fleet-managed/rendered/manifest.yaml
	both modified:   deploy/helm/elastic-agent/examples/kubernetes-default/rendered/manifest.yaml
	both modified:   deploy/helm/elastic-agent/examples/kubernetes-hints-autodiscover/rendered/manifest.yaml
	deleted by us:   deploy/helm/elastic-agent/examples/kubernetes-ksm-sharding/rendered/manifest.yaml
	both modified:   deploy/helm/elastic-agent/examples/kubernetes-only-logs/rendered/manifest.yaml
	both modified:   deploy/helm/elastic-agent/examples/multiple-integrations/rendered/manifest.yaml
	deleted by us:   deploy/helm/elastic-agent/examples/netflow-service/rendered/manifest.yaml
	both modified:   deploy/helm/elastic-agent/examples/nginx-custom-integration/rendered/manifest.yaml
	both modified:   deploy/helm/elastic-agent/examples/system-custom-auth-paths/rendered/manifest.yaml
	both modified:   deploy/helm/elastic-agent/examples/user-cluster-role/rendered/manifest.yaml
	both modified:   deploy/helm/elastic-agent/examples/user-service-account/rendered/manifest.yaml
	both modified:   deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml
	both modified:   deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml
	both modified:   deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml
	both modified:   deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-managed/extra/elastic-agent-managed-statefulset.yaml
	both modified:   deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml
	both modified:   deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/extra/elastic-agent-standalone-statefulset.yaml
	both modified:   deploy/kubernetes/elastic-agent-kustomize/ksm-hints/elastic-agent-standalone/kustomization.yaml
	both modified:   deploy/kubernetes/elastic-agent-managed-kubernetes.yaml
	both modified:   deploy/kubernetes/elastic-agent-standalone-kubernetes.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

# Conflicts:
#	deploy/helm/edot-collector/kube-stack/values.yaml
#	deploy/helm/elastic-agent/examples/eck/rendered/manifest.yaml
#	deploy/helm/elastic-agent/examples/fleet-managed/rendered/manifest.yaml
#	deploy/helm/elastic-agent/examples/kubernetes-default/rendered/manifest.yaml
#	deploy/helm/elastic-agent/examples/kubernetes-hints-autodiscover/rendered/manifest.yaml
#	deploy/helm/elastic-agent/examples/kubernetes-only-logs/rendered/manifest.yaml
#	deploy/helm/elastic-agent/examples/multiple-integrations/rendered/manifest.yaml
#	deploy/helm/elastic-agent/examples/nginx-custom-integration/rendered/manifest.yaml
#	deploy/helm/elastic-agent/examples/system-custom-auth-paths/rendered/manifest.yaml
#	deploy/helm/elastic-agent/examples/user-cluster-role/rendered/manifest.yaml
#	deploy/helm/elastic-agent/examples/user-service-account/rendered/manifest.yaml
#	deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml
#	deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml
#	deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml
#	deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-managed/extra/elastic-agent-managed-statefulset.yaml
#	deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml
#	deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/extra/elastic-agent-standalone-statefulset.yaml
#	deploy/kubernetes/elastic-agent-kustomize/ksm-hints/elastic-agent-standalone/kustomization.yaml
#	deploy/kubernetes/elastic-agent-managed-kubernetes.yaml
#	deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml
Copy link

@pkoutsovasilis pkoutsovasilis merged commit b64c3ee into 8.17 Feb 14, 2025
14 checks passed
@pkoutsovasilis pkoutsovasilis deleted the mergify/bp/8.17/pr-6724 branch February 14, 2025 21:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants