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

[k8s] Correct agent image repository #6724

Merged
merged 4 commits into from
Feb 13, 2025

Conversation

pkoutsovasilis
Copy link
Contributor

@pkoutsovasilis pkoutsovasilis commented Feb 6, 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

@pkoutsovasilis pkoutsovasilis added bug Something isn't working skip-changelog backport-8.x Automated backport to the 8.x branch with mergify backport-8.16 Automated backport with mergify backport-8.17 Automated backport with mergify backport-8.18 Automated backport to the 8.18 branch backport-9.0 Automated backport to the 9.0 branch labels Feb 6, 2025
@pkoutsovasilis pkoutsovasilis self-assigned this Feb 6, 2025
@pkoutsovasilis pkoutsovasilis marked this pull request as ready for review February 6, 2025 08:25
@pkoutsovasilis pkoutsovasilis requested a review from a team as a code owner February 6, 2025 08:25
Copy link
Member

@pchila pchila left a comment

Choose a reason for hiding this comment

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

Looks good, there a few more references to the old docker image name in /pkg/testing/kubernetes/supported.go that I think need to be updated.

I also don't think this needs to be backported to 8.* versions as we stopped publishing elastic-agent image under docker.elastic.co/beats/ starting from 9.0 version

Copy link

@pkoutsovasilis pkoutsovasilis merged commit ed7c19f into elastic:main Feb 13, 2025
14 checks passed
mergify bot pushed a commit that referenced this pull request Feb 13, 2025
* 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
#	internal/pkg/otel/README.md
#	internal/pkg/otel/templates/README.md.tmpl
mergify bot pushed a commit that referenced this pull request Feb 13, 2025
* 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/README.md
#	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 bot pushed a commit that referenced this pull request Feb 13, 2025
* 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 bot pushed a commit that referenced this pull request Feb 13, 2025
* 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/README.md
#	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 bot pushed a commit that referenced this pull request Feb 13, 2025
* 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
pierrehilbert pushed a commit that referenced this pull request Feb 14, 2025
* [k8s] Correct agent image repository (#6724)

* 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

* fix: resolve conflicts

---------

Co-authored-by: Panos Koutsovasilis <panos.koutsovasilis@elastic.co>
pierrehilbert pushed a commit that referenced this pull request Feb 14, 2025
* [k8s] Correct agent image repository (#6724)

* 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/README.md
#	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

* fix: resolve conflicts

* fix: resolve conflicts

* fix: correct versions from backporting

---------

Co-authored-by: Panos Koutsovasilis <panos.koutsovasilis@elastic.co>
pierrehilbert added a commit that referenced this pull request Feb 14, 2025
* [k8s] Correct agent image repository (#6724)

* 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/README.md
#	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

* fix: resolve conflicts

* Update README.md

---------

Co-authored-by: Panos Koutsovasilis <panos.koutsovasilis@elastic.co>
Co-authored-by: Pierre HILBERT <pierre.hilbert@elastic.co>
pkoutsovasilis added a commit that referenced this pull request Feb 14, 2025
* [k8s] Correct agent image repository (#6724)

* 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

* fix: resolve conflicts

* fix: remove ksm helm examples

* fix: remove netflow helm examples

---------

Co-authored-by: Panos Koutsovasilis <panos.koutsovasilis@elastic.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-8.x Automated backport to the 8.x branch with mergify backport-8.16 Automated backport with mergify backport-8.17 Automated backport with mergify backport-8.18 Automated backport to the 8.18 branch backport-9.0 Automated backport to the 9.0 branch bug Something isn't working skip-changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update Elastic Agent Container Image Registry
2 participants