[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
elastic · Feb 13, 2025 · 2ee11d2 · 2ee11d2
1 parent b5fa125
commit 2ee11d2
Show file tree

Hide file tree

Showing 34 changed files with 154 additions and 19 deletions.
diff --git a/deploy/helm/edot-collector/kube-stack/values.yaml b/deploy/helm/edot-collector/kube-stack/values.yaml
@@ -16,8 +16,13 @@ crds:
   create: true # Install the OpenTelemetry Operator CRDs.
 defaultCRConfig:
   image:
+<<<<<<< HEAD
     repository: "docker.elastic.co/beats/elastic-agent"
     tag: "9.0.0"
+=======
+    repository: "docker.elastic.co/elastic-agent/elastic-agent"
+    tag: "9.1.0"
+>>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724))
   targetAllocator:
     enabled: false # Enable/disable the Operator's Target allocator.
     # Refer to: https://github.com/open-telemetry/opentelemetry-operator/tree/main/cmd/otel-allocator

diff --git a/deploy/helm/elastic-agent/README.md b/deploy/helm/elastic-agent/README.md
@@ -145,7 +145,7 @@ The chart built-in [kubernetes integration](https://docs.elastic.co/integrations
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | agent.version | string | `"9.0.0"` | elastic-agent version |
-| agent.image | object | `{"pullPolicy":"IfNotPresent","repository":"docker.elastic.co/beats/elastic-agent","tag":"9.0.0-SNAPSHOT"}` | image configuration |
+| agent.image | object | `{"pullPolicy":"IfNotPresent","repository":"docker.elastic.co/elastic-agent/elastic-agent","tag":"9.0.0-SNAPSHOT"}` | image configuration |
 | agent.imagePullSecrets | list | `[]` | image pull secrets |
 | agent.engine | string | `"k8s"` | generate kubernetes manifests or [ECK](https://github.com/elastic/cloud-on-k8s) CRDs |
 | agent.unprivileged | bool | `false` | enable unprivileged mode |

diff --git a/deploy/helm/elastic-agent/examples/eck/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/eck/rendered/manifest.yaml
@@ -993,7 +993,11 @@ spec:
             value: /usr/share/elastic-agent/state
           - name: ELASTIC_NETINFO
             value: "false"
+<<<<<<< HEAD
           image: docker.elastic.co/beats/elastic-agent:9.0.0-SNAPSHOT
+=======
+          image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT
+>>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724))
           imagePullPolicy: IfNotPresent
           name: agent
           resources:
@@ -1072,7 +1076,11 @@ spec:
             value: /usr/share/elastic-agent/state
           - name: ELASTIC_NETINFO
             value: "false"
+<<<<<<< HEAD
           image: docker.elastic.co/beats/elastic-agent:9.0.0-SNAPSHOT
+=======
+          image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT
+>>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724))
           imagePullPolicy: IfNotPresent
           name: agent
           resources:

diff --git a/deploy/helm/elastic-agent/examples/fleet-managed-ksm-sharding/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/fleet-managed-ksm-sharding/rendered/manifest.yaml
@@ -415,7 +415,11 @@ spec:
           value: "false"
         - name: FLEET_ENROLL
           value: "1"
+<<<<<<< HEAD
         image: docker.elastic.co/beats/elastic-agent:9.0.0-SNAPSHOT
+=======
+        image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT
+>>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724))
         imagePullPolicy: IfNotPresent
         name: agent
         resources:

diff --git a/deploy/helm/elastic-agent/examples/fleet-managed/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/fleet-managed/rendered/manifest.yaml
@@ -404,7 +404,11 @@ spec:
           value: "false"
         - name: FLEET_ENROLL
           value: "1"
+<<<<<<< HEAD
         image: docker.elastic.co/beats/elastic-agent:9.0.0-SNAPSHOT
+=======
+        image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT
+>>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724))
         imagePullPolicy: IfNotPresent
         name: agent
         resources:

diff --git a/deploy/helm/elastic-agent/examples/kubernetes-default/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/kubernetes-default/rendered/manifest.yaml
@@ -909,7 +909,11 @@ spec:
           value: /usr/share/elastic-agent/state
         - name: ELASTIC_NETINFO
           value: "false"
+<<<<<<< HEAD
         image: docker.elastic.co/beats/elastic-agent:9.0.0-SNAPSHOT
+=======
+        image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT
+>>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724))
         imagePullPolicy: IfNotPresent
         name: agent
         resources:
@@ -1090,7 +1094,11 @@ spec:
           value: /usr/share/elastic-agent/state
         - name: ELASTIC_NETINFO
           value: "false"
+<<<<<<< HEAD
         image: docker.elastic.co/beats/elastic-agent:9.0.0-SNAPSHOT
+=======
+        image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT
+>>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724))
         imagePullPolicy: IfNotPresent
         name: agent
         resources:

diff --git a/deploy/helm/elastic-agent/examples/kubernetes-hints-autodiscover/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/kubernetes-hints-autodiscover/rendered/manifest.yaml
@@ -912,7 +912,11 @@ spec:
           value: /usr/share/elastic-agent/state
         - name: ELASTIC_NETINFO
           value: "false"
+<<<<<<< HEAD
         image: docker.elastic.co/beats/elastic-agent:9.0.0-SNAPSHOT
+=======
+        image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT
+>>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724))
         imagePullPolicy: IfNotPresent
         name: agent
         resources:
@@ -1093,7 +1097,11 @@ spec:
           value: /usr/share/elastic-agent/state
         - name: ELASTIC_NETINFO
           value: "false"
+<<<<<<< HEAD
         image: docker.elastic.co/beats/elastic-agent:9.0.0-SNAPSHOT
+=======
+        image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT
+>>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724))
         imagePullPolicy: IfNotPresent
         name: agent
         resources:

diff --git a/deploy/helm/elastic-agent/examples/kubernetes-ksm-sharding/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/kubernetes-ksm-sharding/rendered/manifest.yaml
@@ -980,7 +980,11 @@ spec:
             secretKeyRef:
               key: api_key
               name: es-api-secret
+<<<<<<< HEAD
         image: docker.elastic.co/beats/elastic-agent:9.0.0-SNAPSHOT
+=======
+        image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT
+>>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724))
         imagePullPolicy: IfNotPresent
         name: agent
         resources:
@@ -1086,7 +1090,11 @@ spec:
             secretKeyRef:
               key: api_key
               name: es-api-secret
+<<<<<<< HEAD
         image: docker.elastic.co/beats/elastic-agent:9.0.0-SNAPSHOT
+=======
+        image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT
+>>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724))
         imagePullPolicy: IfNotPresent
         name: agent
         resources:
@@ -1250,7 +1258,11 @@ spec:
             secretKeyRef:
               key: api_key
               name: es-api-secret
+<<<<<<< HEAD
         image: docker.elastic.co/beats/elastic-agent:9.0.0-SNAPSHOT
+=======
+        image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT
+>>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724))
         imagePullPolicy: IfNotPresent
         name: agent
         resources:

diff --git a/deploy/helm/elastic-agent/examples/kubernetes-only-logs/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/kubernetes-only-logs/rendered/manifest.yaml
@@ -244,7 +244,11 @@ spec:
           value: /usr/share/elastic-agent/state
         - name: ELASTIC_NETINFO
           value: "false"
+<<<<<<< HEAD
         image: docker.elastic.co/beats/elastic-agent:9.0.0-SNAPSHOT
+=======
+        image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT
+>>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724))
         imagePullPolicy: IfNotPresent
         name: agent
         resources:

diff --git a/deploy/helm/elastic-agent/examples/multiple-integrations/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/multiple-integrations/rendered/manifest.yaml
@@ -938,7 +938,11 @@ spec:
           value: /usr/share/elastic-agent/state
         - name: ELASTIC_NETINFO
           value: "false"
+<<<<<<< HEAD
         image: docker.elastic.co/beats/elastic-agent:9.0.0-SNAPSHOT
+=======
+        image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT
+>>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724))
         imagePullPolicy: IfNotPresent
         name: agent
         resources:
@@ -1109,7 +1113,11 @@ spec:
           value: /usr/share/elastic-agent/state
         - name: ELASTIC_NETINFO
           value: "false"
+<<<<<<< HEAD
         image: docker.elastic.co/beats/elastic-agent:9.0.0-SNAPSHOT
+=======
+        image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT
+>>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724))
         imagePullPolicy: IfNotPresent
         name: agent
         resources:

diff --git a/deploy/helm/elastic-agent/examples/netflow-service/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/netflow-service/rendered/manifest.yaml
@@ -131,7 +131,11 @@ spec:
             secretKeyRef:
               key: api_key
               name: es-api-secret
+<<<<<<< HEAD
         image: docker.elastic.co/beats/elastic-agent:9.0.0-SNAPSHOT
+=======
+        image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT
+>>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724))
         imagePullPolicy: IfNotPresent
         name: agent
         ports:

diff --git a/deploy/helm/elastic-agent/examples/nginx-custom-integration/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/nginx-custom-integration/rendered/manifest.yaml
@@ -93,7 +93,11 @@ spec:
               fieldPath: metadata.name
         - name: STATE_PATH
           value: /usr/share/elastic-agent/state
+<<<<<<< HEAD
         image: docker.elastic.co/beats/elastic-agent:9.0.0-SNAPSHOT
+=======
+        image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT
+>>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724))
         imagePullPolicy: IfNotPresent
         name: agent
         securityContext:

diff --git a/deploy/helm/elastic-agent/examples/system-custom-auth-paths/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/system-custom-auth-paths/rendered/manifest.yaml
@@ -324,7 +324,11 @@ spec:
           value: /usr/share/elastic-agent/state
         - name: ELASTIC_NETINFO
           value: "false"
+<<<<<<< HEAD
         image: docker.elastic.co/beats/elastic-agent:9.0.0-SNAPSHOT
+=======
+        image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT
+>>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724))
         imagePullPolicy: IfNotPresent
         name: agent
         resources:

diff --git a/deploy/helm/elastic-agent/examples/user-cluster-role/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/user-cluster-role/rendered/manifest.yaml
@@ -132,7 +132,11 @@ spec:
               fieldPath: metadata.name
         - name: STATE_PATH
           value: /usr/share/elastic-agent/state
+<<<<<<< HEAD
         image: docker.elastic.co/beats/elastic-agent:9.0.0-SNAPSHOT
+=======
+        image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT
+>>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724))
         imagePullPolicy: IfNotPresent
         name: agent
         securityContext:

diff --git a/deploy/helm/elastic-agent/examples/user-service-account/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/user-service-account/rendered/manifest.yaml
@@ -889,7 +889,11 @@ spec:
           value: /usr/share/elastic-agent/state
         - name: ELASTIC_NETINFO
           value: "false"
+<<<<<<< HEAD
         image: docker.elastic.co/beats/elastic-agent:9.0.0-SNAPSHOT
+=======
+        image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT
+>>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724))
         imagePullPolicy: IfNotPresent
         name: agent
         resources:
@@ -1070,7 +1074,11 @@ spec:
           value: /usr/share/elastic-agent/state
         - name: ELASTIC_NETINFO
           value: "false"
+<<<<<<< HEAD
         image: docker.elastic.co/beats/elastic-agent:9.0.0-SNAPSHOT
+=======
+        image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT
+>>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724))
         imagePullPolicy: IfNotPresent
         name: agent
         resources:

diff --git a/deploy/helm/elastic-agent/values.yaml b/deploy/helm/elastic-agent/values.yaml
@@ -336,7 +336,7 @@ agent:
   # -- image configuration
   # @section -- 6 - Elastic-Agent Configuration
   image:
-    repository: docker.elastic.co/beats/elastic-agent
+    repository: docker.elastic.co/elastic-agent/elastic-agent
     pullPolicy: IfNotPresent
     tag: "9.0.0-SNAPSHOT"
   # -- image pull secrets

diff --git a/...c-agent-kustomize/default/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml b/...c-agent-kustomize/default/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml
@@ -27,7 +27,11 @@ spec:
       dnsPolicy: ClusterFirstWithHostNet
       containers:
         - name: elastic-agent
+<<<<<<< HEAD
           image: docker.elastic.co/beats/elastic-agent:9.0.0
+=======
+          image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0
+>>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724))
           env:
             # Set to 1 for enrollment into Fleet server. If not set, Elastic Agent is run in standalone mode
             - name: FLEET_ENROLL

diff --git a/...t-kustomize/default/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml b/...t-kustomize/default/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml
@@ -28,7 +28,11 @@ spec:
       # Uncomment if using hints feature
       #initContainers:
       #  - name: k8s-templates-downloader
+<<<<<<< HEAD
       #    image: docker.elastic.co/beats/elastic-agent:9.0.0
+=======
+      #    image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0
+>>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724))
       #    command: ['bash']
       #    args:
       #      - -c
@@ -40,7 +44,11 @@ spec:
       #        mountPath: /etc/elastic-agent/inputs.d
       containers:
         - name: elastic-agent-standalone
+<<<<<<< HEAD
           image: docker.elastic.co/beats/elastic-agent:9.0.0
+=======
+          image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0
+>>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724))
           args: ["-c", "/etc/elastic-agent/agent.yml", "-e"]
           env:
             # The API Key with access privilleges to connect to Elasticsearch. https://www.elastic.co/guide/en/fleet/current/grant-access-to-elasticsearch.html#create-api-key-standalone-agent

diff --git a/...ustomize/ksm-autosharding/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml b/...ustomize/ksm-autosharding/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml
@@ -27,7 +27,11 @@ spec:
       dnsPolicy: ClusterFirstWithHostNet
       containers:
         - name: elastic-agent
+<<<<<<< HEAD
           image: docker.elastic.co/beats/elastic-agent:9.0.0
+=======
+          image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0
+>>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724))
           env:
             # Set to 1 for enrollment into Fleet server. If not set, Elastic Agent is run in standalone mode
             - name: FLEET_ENROLL

diff --git a/...omize/ksm-autosharding/elastic-agent-managed/extra/elastic-agent-managed-statefulset.yaml b/...omize/ksm-autosharding/elastic-agent-managed/extra/elastic-agent-managed-statefulset.yaml
@@ -27,7 +27,11 @@ spec:
       dnsPolicy: ClusterFirstWithHostNet
       containers:
         - name: elastic-agent
+<<<<<<< HEAD
           image: docker.elastic.co/beats/elastic-agent:9.0.0
+=======
+          image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0
+>>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724))
           env:
             # Set to 1 for enrollment into Fleet server. If not set, Elastic Agent is run in standalone mode
             - name: FLEET_ENROLL

diff --git a/...ze/ksm-autosharding/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml b/...ze/ksm-autosharding/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml
@@ -28,7 +28,11 @@ spec:
       # Uncomment if using hints feature
       #initContainers:
       #  - name: k8s-templates-downloader
+<<<<<<< HEAD
       #    image: docker.elastic.co/beats/elastic-agent:9.0.0
+=======
+      #    image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0
+>>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724))
       #    command: ['bash']
       #    args:
       #      - -c
@@ -40,7 +44,11 @@ spec:
       #        mountPath: /etc/elastic-agent/inputs.d
       containers:
         - name: elastic-agent-standalone
+<<<<<<< HEAD
           image: docker.elastic.co/beats/elastic-agent:9.0.0
+=======
+          image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0
+>>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724))
           args: ["-c", "/etc/elastic-agent/agent.yml", "-e"]
           env:
             # The API Key with access privilleges to connect to Elasticsearch. https://www.elastic.co/guide/en/fleet/current/grant-access-to-elasticsearch.html#create-api-key-standalone-agent

diff --git a/...ksm-autosharding/elastic-agent-standalone/extra/elastic-agent-standalone-statefulset.yaml b/...ksm-autosharding/elastic-agent-standalone/extra/elastic-agent-standalone-statefulset.yaml
@@ -28,7 +28,11 @@ spec:
       # Uncomment if using hints feature
       #initContainers:
       #  - name: k8s-templates-downloader
+<<<<<<< HEAD
       #    image: docker.elastic.co/beats/elastic-agent:9.0.0
+=======
+      #    image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0
+>>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724))
       #    command: ['bash']
       #    args:
       #      - -c
@@ -40,7 +44,11 @@ spec:
       #        mountPath: /etc/elastic-agent/inputs.d
       containers:
         - name: elastic-agent-standalone
+<<<<<<< HEAD
           image: docker.elastic.co/beats/elastic-agent:9.0.0
+=======
+          image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0
+>>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724))
           args: ["-c", "/etc/elastic-agent/agent.yml", "-e"]
           env:
             # The API Key with access privilleges to connect to Elasticsearch. https://www.elastic.co/guide/en/fleet/current/grant-access-to-elasticsearch.html#create-api-key-standalone-agent

diff --git a/.../kubernetes/elastic-agent-kustomize/ksm-hints/elastic-agent-standalone/kustomization.yaml b/.../kubernetes/elastic-agent-kustomize/ksm-hints/elastic-agent-standalone/kustomization.yaml
@@ -19,7 +19,11 @@ patches:
         spec:
           initContainers:
             - name: k8s-templates-downloader
+<<<<<<< HEAD
               image: docker.elastic.co/beats/elastic-agent:9.0.0
+=======
+              image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0
+>>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724))
               command: ['bash']
               args:
                 - -c
@@ -37,4 +41,3 @@ patches:
           volumes:
             - name: external-inputs
               emptyDir: {}
-