From 27f9117a8f2d8e81d7c5f11f3aff918e2c798668 Mon Sep 17 00:00:00 2001 From: Panos Koutsovasilis Date: Thu, 13 Feb 2025 13:06:07 +0200 Subject: [PATCH 1/3] [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 (cherry picked from commit ed7c19f3b5983f9afc765072352a7c0d85746b22) # 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 --- deploy/helm/edot-collector/kube-stack/values.yaml | 5 +++++ deploy/helm/elastic-agent/README.md | 5 +++++ .../examples/eck/rendered/manifest.yaml | 8 ++++++++ .../rendered/manifest.yaml | 4 ++++ .../examples/fleet-managed/rendered/manifest.yaml | 4 ++++ .../kubernetes-default/rendered/manifest.yaml | 8 ++++++++ .../rendered/manifest.yaml | 8 ++++++++ .../kubernetes-ksm-sharding/rendered/manifest.yaml | 12 ++++++++++++ .../kubernetes-only-logs/rendered/manifest.yaml | 4 ++++ .../multiple-integrations/rendered/manifest.yaml | 8 ++++++++ .../examples/netflow-service/rendered/manifest.yaml | 4 ++++ .../nginx-custom-integration/rendered/manifest.yaml | 4 ++++ .../system-custom-auth-paths/rendered/manifest.yaml | 4 ++++ .../user-cluster-role/rendered/manifest.yaml | 4 ++++ .../user-service-account/rendered/manifest.yaml | 8 ++++++++ deploy/helm/elastic-agent/values.yaml | 2 +- .../base/elastic-agent-managed-daemonset.yaml | 4 ++++ .../base/elastic-agent-standalone-daemonset.yaml | 8 ++++++++ .../base/elastic-agent-managed-daemonset.yaml | 4 ++++ .../extra/elastic-agent-managed-statefulset.yaml | 4 ++++ .../base/elastic-agent-standalone-daemonset.yaml | 8 ++++++++ .../extra/elastic-agent-standalone-statefulset.yaml | 8 ++++++++ .../elastic-agent-standalone/kustomization.yaml | 5 ++++- .../kustomization.yaml.original | 3 +-- .../kubernetes/elastic-agent-managed-kubernetes.yaml | 4 ++++ .../elastic-agent-managed-daemonset.yaml | 2 +- .../elastic-agent-standalone-kubernetes.yaml | 8 ++++++++ .../elastic-agent-standalone-daemonset.yaml | 4 ++-- dev-tools/packaging/packages.yml | 2 +- docs/local-k8s-testing.md | 6 +++--- internal/pkg/otel/README.md | 2 +- internal/pkg/otel/templates/README.md.tmpl | 2 +- pkg/testing/kubernetes/supported.go | 8 ++++---- skaffold.yaml | 2 +- 34 files changed, 158 insertions(+), 18 deletions(-) diff --git a/deploy/helm/edot-collector/kube-stack/values.yaml b/deploy/helm/edot-collector/kube-stack/values.yaml index 841efeb91a2..a8c2784aaa1 100644 --- 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: "8.18.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 index 4dda4465719..c818f598174 100644 --- a/deploy/helm/elastic-agent/README.md +++ b/deploy/helm/elastic-agent/README.md @@ -144,8 +144,13 @@ The chart built-in [kubernetes integration](https://docs.elastic.co/integrations ### 6 - Elastic-Agent Configuration | Key | Type | Default | Description | |-----|------|---------|-------------| +<<<<<<< HEAD | agent.version | string | `"8.18.0"` | elastic-agent version | | agent.image | object | `{"pullPolicy":"IfNotPresent","repository":"docker.elastic.co/beats/elastic-agent","tag":"8.18.0-SNAPSHOT"}` | image configuration | +======= +| agent.version | string | `"9.0.0"` | elastic-agent version | +| agent.image | object | `{"pullPolicy":"IfNotPresent","repository":"docker.elastic.co/elastic-agent/elastic-agent","tag":"9.0.0-SNAPSHOT"}` | image configuration | +>>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724)) | 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 index c74e387cd42..862c39a1b35 100644 --- 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:8.18.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:8.18.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 index 64be8017c2c..50640f9973c 100644 --- 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:8.18.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 index 54201fcd283..d08bc7eea09 100644 --- 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:8.18.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 index c1d117f9b0a..67e6c78d8de 100644 --- 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:8.18.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:8.18.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 index 3f61f50d791..000ff851353 100644 --- 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:8.18.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:8.18.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 index c4e5419bd34..52bffc05947 100644 --- 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:8.18.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:8.18.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:8.18.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 index a2dfdeee49a..8d51d851ce2 100644 --- 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:8.18.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 index 9a1e30758ab..5a6f3b0b1bc 100644 --- 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:8.18.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:8.18.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 index f1609b93e17..d0b673cfb29 100644 --- 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:8.18.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 index fc5932afe44..b4d0653ebe0 100644 --- 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:8.18.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 index c9d6554115d..c1c2751984a 100644 --- 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:8.18.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 index fc33a38afdc..9e2090bee6b 100644 --- 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:8.18.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 index 475031a59be..0d24a471d6a 100644 --- 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:8.18.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:8.18.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 index 5a0643c478c..df49842c595 100644 --- 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: "8.18.0-SNAPSHOT" # -- image pull secrets diff --git a/deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml b/deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml index f10baaf39bc..0a860860cf1 100644 --- a/deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml +++ b/deploy/kubernetes/elastic-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:8.18.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/deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml b/deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml index d5df2bf5b25..af7b4da902e 100644 --- a/deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml +++ b/deploy/kubernetes/elastic-agent-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:8.18.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:8.18.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/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml b/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml index 9bd396e4ed3..e9d9e7b52fd 100644 --- a/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml +++ b/deploy/kubernetes/elastic-agent-kustomize/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:8.18.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/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-managed/extra/elastic-agent-managed-statefulset.yaml b/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-managed/extra/elastic-agent-managed-statefulset.yaml index a751c38fa8e..5fcb6f4e93d 100644 --- a/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-managed/extra/elastic-agent-managed-statefulset.yaml +++ b/deploy/kubernetes/elastic-agent-kustomize/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:8.18.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/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml b/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml index b962cde20d2..1b24201e186 100644 --- a/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml +++ b/deploy/kubernetes/elastic-agent-kustomize/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:8.18.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:8.18.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/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/extra/elastic-agent-standalone-statefulset.yaml b/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/extra/elastic-agent-standalone-statefulset.yaml index 2ee5f93d2b8..b42cb970524 100644 --- a/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/extra/elastic-agent-standalone-statefulset.yaml +++ b/deploy/kubernetes/elastic-agent-kustomize/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:8.18.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:8.18.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/deploy/kubernetes/elastic-agent-kustomize/ksm-hints/elastic-agent-standalone/kustomization.yaml b/deploy/kubernetes/elastic-agent-kustomize/ksm-hints/elastic-agent-standalone/kustomization.yaml index 80452072f41..5868936445a 100644 --- a/deploy/kubernetes/elastic-agent-kustomize/ksm-hints/elastic-agent-standalone/kustomization.yaml +++ b/deploy/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:8.18.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: {} - \ No newline at end of file diff --git a/deploy/kubernetes/elastic-agent-kustomize/ksm-hints/elastic-agent-standalone/kustomization.yaml.original b/deploy/kubernetes/elastic-agent-kustomize/ksm-hints/elastic-agent-standalone/kustomization.yaml.original index 8d5ac86e75f..da9aecb93ab 100644 --- a/deploy/kubernetes/elastic-agent-kustomize/ksm-hints/elastic-agent-standalone/kustomization.yaml.original +++ b/deploy/kubernetes/elastic-agent-kustomize/ksm-hints/elastic-agent-standalone/kustomization.yaml.original @@ -19,7 +19,7 @@ patches: spec: initContainers: - name: k8s-templates-downloader - image: docker.elastic.co/beats/elastic-agent:%VERSION% + image: docker.elastic.co/elastic-agent/elastic-agent:%VERSION% command: ['bash'] args: - -c @@ -37,4 +37,3 @@ patches: volumes: - name: external-inputs emptyDir: {} - \ No newline at end of file diff --git a/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml b/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml index 8dbac36262e..32a989c5b5c 100644 --- a/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml +++ b/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml @@ -27,7 +27,11 @@ spec: dnsPolicy: ClusterFirstWithHostNet containers: - name: elastic-agent +<<<<<<< HEAD image: docker.elastic.co/beats/elastic-agent:8.18.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/deploy/kubernetes/elastic-agent-managed/elastic-agent-managed-daemonset.yaml b/deploy/kubernetes/elastic-agent-managed/elastic-agent-managed-daemonset.yaml index 0d26e4c2aab..c0a7670b163 100644 --- a/deploy/kubernetes/elastic-agent-managed/elastic-agent-managed-daemonset.yaml +++ b/deploy/kubernetes/elastic-agent-managed/elastic-agent-managed-daemonset.yaml @@ -27,7 +27,7 @@ spec: dnsPolicy: ClusterFirstWithHostNet containers: - name: elastic-agent - image: docker.elastic.co/beats/elastic-agent:%VERSION% + image: docker.elastic.co/elastic-agent/elastic-agent:%VERSION% 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/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml b/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml index 8d1a7b5e840..b24b9166d6f 100644 --- a/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml +++ b/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml @@ -704,7 +704,11 @@ spec: # Uncomment if using hints feature #initContainers: # - name: k8s-templates-downloader +<<<<<<< HEAD # image: docker.elastic.co/beats/elastic-agent:8.18.0 +======= + # image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0 +>>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724)) # command: ['bash'] # args: # - -c @@ -716,7 +720,11 @@ spec: # mountPath: /etc/elastic-agent/inputs.d containers: - name: elastic-agent-standalone +<<<<<<< HEAD image: docker.elastic.co/beats/elastic-agent:8.18.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/deploy/kubernetes/elastic-agent-standalone/elastic-agent-standalone-daemonset.yaml b/deploy/kubernetes/elastic-agent-standalone/elastic-agent-standalone-daemonset.yaml index 3b07997a291..9d471e5bccc 100644 --- a/deploy/kubernetes/elastic-agent-standalone/elastic-agent-standalone-daemonset.yaml +++ b/deploy/kubernetes/elastic-agent-standalone/elastic-agent-standalone-daemonset.yaml @@ -28,7 +28,7 @@ spec: # Uncomment if using hints feature #initContainers: # - name: k8s-templates-downloader - # image: docker.elastic.co/beats/elastic-agent:%VERSION% + # image: docker.elastic.co/elastic-agent/elastic-agent:%VERSION% # command: ['bash'] # args: # - -c @@ -40,7 +40,7 @@ spec: # mountPath: /etc/elastic-agent/inputs.d containers: - name: elastic-agent-standalone - image: docker.elastic.co/beats/elastic-agent:%VERSION% + image: docker.elastic.co/elastic-agent/elastic-agent:%VERSION% 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/dev-tools/packaging/packages.yml b/dev-tools/packaging/packages.yml index f2bdddb36be..a756024b220 100644 --- a/dev-tools/packaging/packages.yml +++ b/dev-tools/packaging/packages.yml @@ -251,7 +251,7 @@ shared: - &docker_elastic_spec extra_vars: - repository: 'docker.elastic.co/beats' + repository: 'docker.elastic.co/elastic-agent' - &agent_docker_spec <<: *agent_binary_spec diff --git a/docs/local-k8s-testing.md b/docs/local-k8s-testing.md index ce7ea0086ee..d0b3b9b88d7 100644 --- a/docs/local-k8s-testing.md +++ b/docs/local-k8s-testing.md @@ -36,7 +36,7 @@ FLEET_URL=https://:443 FLEET_ENROLLMENT_TOKEN= ``` -### Run agent +### Run agent In order to just deploy agent on your local cluster, open a terminal and then execute @@ -49,7 +49,7 @@ and the output should be something similar to this: Generating tags... ... Checking cache... - - docker.elastic.co/beats/elastic-agent: Found Locally + - docker.elastic.co/elastic-agent/elastic-agent: Found Locally Starting test... Starting pre-render hooks... Completed pre-render hooks @@ -104,7 +104,7 @@ Images loaded in 35.802479ms Waiting for deployments to stabilize... Deployments stabilized in 7.654873ms Listing files to watch... - - docker.elastic.co/beats/elastic-agent + - docker.elastic.co/elastic-agent/elastic-agent Press Ctrl+C to exit Not watching for changes... WARN[0003] unable to get owner from reference: {apps/v1 DaemonSet elastic-agent-standalone 0c579ec4-319a-4e85-99ec-c409260cb6ce 0xc000f950a0 0xc000f950a1} subtask=-1 task=DevLoop diff --git a/internal/pkg/otel/README.md b/internal/pkg/otel/README.md index e67a7d66b56..f66a740504a 100644 --- a/internal/pkg/otel/README.md +++ b/internal/pkg/otel/README.md @@ -138,7 +138,7 @@ If you remove the `create_directory: true` option, you'll need to manually creat By default, when running Elastic Distribution for OpenTelemetry Collector in Docker, checkpoints are stored in `/usr/share/elastic-agent/otel_registry` by default. To ensure data persists across container restarts, you can use the following command: ```bash -docker run --rm -ti --entrypoint="elastic-agent" --mount type=bind,source=/path/on/host,target=/usr/share/elastic-agent/otel_registry docker.elastic.co/beats/elastic-agent:9.0.0-SNAPSHOT otel +docker run --rm -ti --entrypoint="elastic-agent" --mount type=bind,source=/path/on/host,target=/usr/share/elastic-agent/otel_registry docker.elastic.co/elastic-agent/elastic-agent:9.0.0-SNAPSHOT otel ``` ### Known issues: diff --git a/internal/pkg/otel/templates/README.md.tmpl b/internal/pkg/otel/templates/README.md.tmpl index c73668cd507..fc560284bc9 100644 --- a/internal/pkg/otel/templates/README.md.tmpl +++ b/internal/pkg/otel/templates/README.md.tmpl @@ -123,7 +123,7 @@ If you remove the `create_directory: true` option, you'll need to manually creat By default, when running Elastic Distribution for OpenTelemetry Collector in Docker, checkpoints are stored in `/usr/share/elastic-agent/otel_registry` by default. To ensure data persists across container restarts, you can use the following command: ```bash -docker run --rm -ti --entrypoint="elastic-agent" --mount type=bind,source=/path/on/host,target=/usr/share/elastic-agent/otel_registry docker.elastic.co/beats/elastic-agent:9.0.0-SNAPSHOT otel +docker run --rm -ti --entrypoint="elastic-agent" --mount type=bind,source=/path/on/host,target=/usr/share/elastic-agent/otel_registry docker.elastic.co/elastic-agent/elastic-agent:9.0.0-SNAPSHOT otel ``` ### Known issues: diff --git a/pkg/testing/kubernetes/supported.go b/pkg/testing/kubernetes/supported.go index e7db5ba71c3..b815e6cdd8e 100644 --- a/pkg/testing/kubernetes/supported.go +++ b/pkg/testing/kubernetes/supported.go @@ -50,7 +50,7 @@ var variants = []struct { }{ { Name: "basic", - Image: "docker.elastic.co/beats/elastic-agent", + Image: "docker.elastic.co/elastic-agent/elastic-agent", }, { Name: "ubi", @@ -58,15 +58,15 @@ var variants = []struct { }, { Name: "wolfi", - Image: "docker.elastic.co/beats/elastic-agent-wolfi", + Image: "docker.elastic.co/elastic-agent/elastic-agent-wolfi", }, { Name: "complete", - Image: "docker.elastic.co/beats/elastic-agent-complete", + Image: "docker.elastic.co/elastic-agent/elastic-agent-complete", }, { Name: "complete-wolfi", - Image: "docker.elastic.co/beats/elastic-agent-complete-wolfi", + Image: "docker.elastic.co/elastic-agent/elastic-agent-complete-wolfi", }, { Name: "cloud", diff --git a/skaffold.yaml b/skaffold.yaml index 46e1c0cd300..a81ae8c7cda 100644 --- a/skaffold.yaml +++ b/skaffold.yaml @@ -8,7 +8,7 @@ build: useBuildkit: false useDockerCLI: true artifacts: - - image: docker.elastic.co/beats/elastic-agent + - image: docker.elastic.co/elastic-agent/elastic-agent docker: dockerfile: Dockerfile.skaffold noCache: false From 9e5b559ad157a96760eec18bd8340906ed64f5fa Mon Sep 17 00:00:00 2001 From: Panos Koutsovasilis Date: Thu, 13 Feb 2025 22:42:23 +0200 Subject: [PATCH 2/3] fix: resolve conflicts --- .../helm/edot-collector/kube-stack/values.yaml | 7 +------ deploy/helm/elastic-agent/README.md | 6 +----- .../examples/eck/rendered/manifest.yaml | 12 ++---------- .../rendered/manifest.yaml | 6 +----- .../fleet-managed/rendered/manifest.yaml | 6 +----- .../kubernetes-default/rendered/manifest.yaml | 12 ++---------- .../rendered/manifest.yaml | 12 ++---------- .../rendered/manifest.yaml | 18 +++--------------- .../rendered/manifest.yaml | 6 +----- .../rendered/manifest.yaml | 12 ++---------- .../netflow-service/rendered/manifest.yaml | 6 +----- .../rendered/manifest.yaml | 6 +----- .../rendered/manifest.yaml | 6 +----- .../user-cluster-role/rendered/manifest.yaml | 6 +----- .../rendered/manifest.yaml | 12 ++---------- .../base/elastic-agent-managed-daemonset.yaml | 6 +----- .../elastic-agent-standalone-daemonset.yaml | 12 ++---------- .../base/elastic-agent-managed-daemonset.yaml | 6 +----- .../elastic-agent-managed-statefulset.yaml | 6 +----- .../elastic-agent-standalone-daemonset.yaml | 12 ++---------- .../elastic-agent-standalone-statefulset.yaml | 12 ++---------- .../kustomization.yaml | 6 +----- .../elastic-agent-managed-kubernetes.yaml | 6 +----- .../elastic-agent-standalone-kubernetes.yaml | 12 ++---------- 24 files changed, 35 insertions(+), 176 deletions(-) diff --git a/deploy/helm/edot-collector/kube-stack/values.yaml b/deploy/helm/edot-collector/kube-stack/values.yaml index a8c2784aaa1..61f1f4df4e9 100644 --- a/deploy/helm/edot-collector/kube-stack/values.yaml +++ b/deploy/helm/edot-collector/kube-stack/values.yaml @@ -16,13 +16,8 @@ crds: create: true # Install the OpenTelemetry Operator CRDs. defaultCRConfig: image: -<<<<<<< HEAD - repository: "docker.elastic.co/beats/elastic-agent" - tag: "8.18.0" -======= repository: "docker.elastic.co/elastic-agent/elastic-agent" - tag: "9.1.0" ->>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724)) + tag: "8.18.0" 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 index c818f598174..4ed1d1c6a71 100644 --- a/deploy/helm/elastic-agent/README.md +++ b/deploy/helm/elastic-agent/README.md @@ -144,12 +144,8 @@ The chart built-in [kubernetes integration](https://docs.elastic.co/integrations ### 6 - Elastic-Agent Configuration | Key | Type | Default | Description | |-----|------|---------|-------------| -<<<<<<< HEAD | agent.version | string | `"8.18.0"` | elastic-agent version | -| agent.image | object | `{"pullPolicy":"IfNotPresent","repository":"docker.elastic.co/beats/elastic-agent","tag":"8.18.0-SNAPSHOT"}` | image configuration | -======= -| agent.version | string | `"9.0.0"` | elastic-agent version | -| agent.image | object | `{"pullPolicy":"IfNotPresent","repository":"docker.elastic.co/elastic-agent/elastic-agent","tag":"9.0.0-SNAPSHOT"}` | image configuration | +| agent.image | object | `{"pullPolicy":"IfNotPresent","repository":"docker.elastic.co/elastic-agent/elastic-agent","tag":"8.18.0-SNAPSHOT"}` | image configuration | >>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724)) | agent.imagePullSecrets | list | `[]` | image pull secrets | | agent.engine | string | `"k8s"` | generate kubernetes manifests or [ECK](https://github.com/elastic/cloud-on-k8s) CRDs | diff --git a/deploy/helm/elastic-agent/examples/eck/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/eck/rendered/manifest.yaml index 862c39a1b35..db6a1cce709 100644 --- a/deploy/helm/elastic-agent/examples/eck/rendered/manifest.yaml +++ b/deploy/helm/elastic-agent/examples/eck/rendered/manifest.yaml @@ -993,11 +993,7 @@ spec: value: /usr/share/elastic-agent/state - name: ELASTIC_NETINFO value: "false" -<<<<<<< HEAD - image: docker.elastic.co/beats/elastic-agent:8.18.0-SNAPSHOT -======= - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT ->>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724)) + image: docker.elastic.co/elastic-agent/elastic-agent:8.18.0-SNAPSHOT imagePullPolicy: IfNotPresent name: agent resources: @@ -1076,11 +1072,7 @@ spec: value: /usr/share/elastic-agent/state - name: ELASTIC_NETINFO value: "false" -<<<<<<< HEAD - image: docker.elastic.co/beats/elastic-agent:8.18.0-SNAPSHOT -======= - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT ->>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724)) + image: docker.elastic.co/elastic-agent/elastic-agent:8.18.0-SNAPSHOT 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 index 50640f9973c..825a452b9ad 100644 --- 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,11 +415,7 @@ spec: value: "false" - name: FLEET_ENROLL value: "1" -<<<<<<< HEAD - image: docker.elastic.co/beats/elastic-agent:8.18.0-SNAPSHOT -======= - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT ->>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724)) + image: docker.elastic.co/elastic-agent/elastic-agent:8.18.0-SNAPSHOT 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 index d08bc7eea09..3fab751e4a6 100644 --- a/deploy/helm/elastic-agent/examples/fleet-managed/rendered/manifest.yaml +++ b/deploy/helm/elastic-agent/examples/fleet-managed/rendered/manifest.yaml @@ -404,11 +404,7 @@ spec: value: "false" - name: FLEET_ENROLL value: "1" -<<<<<<< HEAD - image: docker.elastic.co/beats/elastic-agent:8.18.0-SNAPSHOT -======= - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT ->>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724)) + image: docker.elastic.co/elastic-agent/elastic-agent:8.18.0-SNAPSHOT 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 index 67e6c78d8de..0ad456ef3ba 100644 --- a/deploy/helm/elastic-agent/examples/kubernetes-default/rendered/manifest.yaml +++ b/deploy/helm/elastic-agent/examples/kubernetes-default/rendered/manifest.yaml @@ -909,11 +909,7 @@ spec: value: /usr/share/elastic-agent/state - name: ELASTIC_NETINFO value: "false" -<<<<<<< HEAD - image: docker.elastic.co/beats/elastic-agent:8.18.0-SNAPSHOT -======= - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT ->>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724)) + image: docker.elastic.co/elastic-agent/elastic-agent:8.18.0-SNAPSHOT imagePullPolicy: IfNotPresent name: agent resources: @@ -1094,11 +1090,7 @@ spec: value: /usr/share/elastic-agent/state - name: ELASTIC_NETINFO value: "false" -<<<<<<< HEAD - image: docker.elastic.co/beats/elastic-agent:8.18.0-SNAPSHOT -======= - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT ->>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724)) + image: docker.elastic.co/elastic-agent/elastic-agent:8.18.0-SNAPSHOT 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 index 000ff851353..ad270b637b8 100644 --- 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,11 +912,7 @@ spec: value: /usr/share/elastic-agent/state - name: ELASTIC_NETINFO value: "false" -<<<<<<< HEAD - image: docker.elastic.co/beats/elastic-agent:8.18.0-SNAPSHOT -======= - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT ->>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724)) + image: docker.elastic.co/elastic-agent/elastic-agent:8.18.0-SNAPSHOT imagePullPolicy: IfNotPresent name: agent resources: @@ -1097,11 +1093,7 @@ spec: value: /usr/share/elastic-agent/state - name: ELASTIC_NETINFO value: "false" -<<<<<<< HEAD - image: docker.elastic.co/beats/elastic-agent:8.18.0-SNAPSHOT -======= - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT ->>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724)) + image: docker.elastic.co/elastic-agent/elastic-agent:8.18.0-SNAPSHOT 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 index 52bffc05947..a2963c3b6b4 100644 --- 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,11 +980,7 @@ spec: secretKeyRef: key: api_key name: es-api-secret -<<<<<<< HEAD - image: docker.elastic.co/beats/elastic-agent:8.18.0-SNAPSHOT -======= - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT ->>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724)) + image: docker.elastic.co/elastic-agent/elastic-agent:8.18.0-SNAPSHOT imagePullPolicy: IfNotPresent name: agent resources: @@ -1090,11 +1086,7 @@ spec: secretKeyRef: key: api_key name: es-api-secret -<<<<<<< HEAD - image: docker.elastic.co/beats/elastic-agent:8.18.0-SNAPSHOT -======= - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT ->>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724)) + image: docker.elastic.co/elastic-agent/elastic-agent:8.18.0-SNAPSHOT imagePullPolicy: IfNotPresent name: agent resources: @@ -1258,11 +1250,7 @@ spec: secretKeyRef: key: api_key name: es-api-secret -<<<<<<< HEAD - image: docker.elastic.co/beats/elastic-agent:8.18.0-SNAPSHOT -======= - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT ->>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724)) + image: docker.elastic.co/elastic-agent/elastic-agent:8.18.0-SNAPSHOT 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 index 8d51d851ce2..bf9bfc1a1c7 100644 --- 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,11 +244,7 @@ spec: value: /usr/share/elastic-agent/state - name: ELASTIC_NETINFO value: "false" -<<<<<<< HEAD - image: docker.elastic.co/beats/elastic-agent:8.18.0-SNAPSHOT -======= - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT ->>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724)) + image: docker.elastic.co/elastic-agent/elastic-agent:8.18.0-SNAPSHOT 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 index 5a6f3b0b1bc..17654519fb1 100644 --- a/deploy/helm/elastic-agent/examples/multiple-integrations/rendered/manifest.yaml +++ b/deploy/helm/elastic-agent/examples/multiple-integrations/rendered/manifest.yaml @@ -938,11 +938,7 @@ spec: value: /usr/share/elastic-agent/state - name: ELASTIC_NETINFO value: "false" -<<<<<<< HEAD - image: docker.elastic.co/beats/elastic-agent:8.18.0-SNAPSHOT -======= - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT ->>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724)) + image: docker.elastic.co/elastic-agent/elastic-agent:8.18.0-SNAPSHOT imagePullPolicy: IfNotPresent name: agent resources: @@ -1113,11 +1109,7 @@ spec: value: /usr/share/elastic-agent/state - name: ELASTIC_NETINFO value: "false" -<<<<<<< HEAD - image: docker.elastic.co/beats/elastic-agent:8.18.0-SNAPSHOT -======= - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT ->>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724)) + image: docker.elastic.co/elastic-agent/elastic-agent:8.18.0-SNAPSHOT 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 index d0b673cfb29..2e9de96317a 100644 --- a/deploy/helm/elastic-agent/examples/netflow-service/rendered/manifest.yaml +++ b/deploy/helm/elastic-agent/examples/netflow-service/rendered/manifest.yaml @@ -131,11 +131,7 @@ spec: secretKeyRef: key: api_key name: es-api-secret -<<<<<<< HEAD - image: docker.elastic.co/beats/elastic-agent:8.18.0-SNAPSHOT -======= - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT ->>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724)) + image: docker.elastic.co/elastic-agent/elastic-agent:8.18.0-SNAPSHOT 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 index b4d0653ebe0..3608147a8d3 100644 --- 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,11 +93,7 @@ spec: fieldPath: metadata.name - name: STATE_PATH value: /usr/share/elastic-agent/state -<<<<<<< HEAD - image: docker.elastic.co/beats/elastic-agent:8.18.0-SNAPSHOT -======= - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT ->>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724)) + image: docker.elastic.co/elastic-agent/elastic-agent:8.18.0-SNAPSHOT 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 index c1c2751984a..59245e942f4 100644 --- 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,11 +324,7 @@ spec: value: /usr/share/elastic-agent/state - name: ELASTIC_NETINFO value: "false" -<<<<<<< HEAD - image: docker.elastic.co/beats/elastic-agent:8.18.0-SNAPSHOT -======= - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT ->>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724)) + image: docker.elastic.co/elastic-agent/elastic-agent:8.18.0-SNAPSHOT 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 index 9e2090bee6b..3da6fa7a99b 100644 --- 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,11 +132,7 @@ spec: fieldPath: metadata.name - name: STATE_PATH value: /usr/share/elastic-agent/state -<<<<<<< HEAD - image: docker.elastic.co/beats/elastic-agent:8.18.0-SNAPSHOT -======= - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT ->>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724)) + image: docker.elastic.co/elastic-agent/elastic-agent:8.18.0-SNAPSHOT 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 index 0d24a471d6a..e172d8f3beb 100644 --- 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,11 +889,7 @@ spec: value: /usr/share/elastic-agent/state - name: ELASTIC_NETINFO value: "false" -<<<<<<< HEAD - image: docker.elastic.co/beats/elastic-agent:8.18.0-SNAPSHOT -======= - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT ->>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724)) + image: docker.elastic.co/elastic-agent/elastic-agent:8.18.0-SNAPSHOT imagePullPolicy: IfNotPresent name: agent resources: @@ -1074,11 +1070,7 @@ spec: value: /usr/share/elastic-agent/state - name: ELASTIC_NETINFO value: "false" -<<<<<<< HEAD - image: docker.elastic.co/beats/elastic-agent:8.18.0-SNAPSHOT -======= - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT ->>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724)) + image: docker.elastic.co/elastic-agent/elastic-agent:8.18.0-SNAPSHOT imagePullPolicy: IfNotPresent name: agent resources: diff --git a/deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml b/deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml index 0a860860cf1..7e63e768813 100644 --- a/deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml +++ b/deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml @@ -27,11 +27,7 @@ spec: dnsPolicy: ClusterFirstWithHostNet containers: - name: elastic-agent -<<<<<<< HEAD - image: docker.elastic.co/beats/elastic-agent:8.18.0 -======= - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0 ->>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724)) + image: docker.elastic.co/elastic-agent/elastic-agent:8.18.0 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/deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml b/deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml index af7b4da902e..e40068e5c11 100644 --- a/deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml +++ b/deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml @@ -28,11 +28,7 @@ spec: # Uncomment if using hints feature #initContainers: # - name: k8s-templates-downloader -<<<<<<< HEAD - # image: docker.elastic.co/beats/elastic-agent:8.18.0 -======= - # image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0 ->>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724)) + # image: docker.elastic.co/elastic-agent/elastic-agent:8.18.0 # command: ['bash'] # args: # - -c @@ -44,11 +40,7 @@ spec: # mountPath: /etc/elastic-agent/inputs.d containers: - name: elastic-agent-standalone -<<<<<<< HEAD - image: docker.elastic.co/beats/elastic-agent:8.18.0 -======= - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0 ->>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724)) + image: docker.elastic.co/elastic-agent/elastic-agent:8.18.0 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/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml b/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml index e9d9e7b52fd..e720a97d539 100644 --- a/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml +++ b/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml @@ -27,11 +27,7 @@ spec: dnsPolicy: ClusterFirstWithHostNet containers: - name: elastic-agent -<<<<<<< HEAD - image: docker.elastic.co/beats/elastic-agent:8.18.0 -======= - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0 ->>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724)) + image: docker.elastic.co/elastic-agent/elastic-agent:8.18.0 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/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-managed/extra/elastic-agent-managed-statefulset.yaml b/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-managed/extra/elastic-agent-managed-statefulset.yaml index 5fcb6f4e93d..3e3021cbad8 100644 --- a/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-managed/extra/elastic-agent-managed-statefulset.yaml +++ b/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-managed/extra/elastic-agent-managed-statefulset.yaml @@ -27,11 +27,7 @@ spec: dnsPolicy: ClusterFirstWithHostNet containers: - name: elastic-agent -<<<<<<< HEAD - image: docker.elastic.co/beats/elastic-agent:8.18.0 -======= - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0 ->>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724)) + image: docker.elastic.co/elastic-agent/elastic-agent:8.18.0 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/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml b/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml index 1b24201e186..a9bd7da0e46 100644 --- a/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml +++ b/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml @@ -28,11 +28,7 @@ spec: # Uncomment if using hints feature #initContainers: # - name: k8s-templates-downloader -<<<<<<< HEAD - # image: docker.elastic.co/beats/elastic-agent:8.18.0 -======= - # image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0 ->>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724)) + # image: docker.elastic.co/elastic-agent/elastic-agent:8.18.0 # command: ['bash'] # args: # - -c @@ -44,11 +40,7 @@ spec: # mountPath: /etc/elastic-agent/inputs.d containers: - name: elastic-agent-standalone -<<<<<<< HEAD - image: docker.elastic.co/beats/elastic-agent:8.18.0 -======= - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0 ->>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724)) + image: docker.elastic.co/elastic-agent/elastic-agent:8.18.0 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/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/extra/elastic-agent-standalone-statefulset.yaml b/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/extra/elastic-agent-standalone-statefulset.yaml index b42cb970524..f0901f3774c 100644 --- a/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/extra/elastic-agent-standalone-statefulset.yaml +++ b/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/extra/elastic-agent-standalone-statefulset.yaml @@ -28,11 +28,7 @@ spec: # Uncomment if using hints feature #initContainers: # - name: k8s-templates-downloader -<<<<<<< HEAD - # image: docker.elastic.co/beats/elastic-agent:8.18.0 -======= - # image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0 ->>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724)) + # image: docker.elastic.co/elastic-agent/elastic-agent:8.18.0 # command: ['bash'] # args: # - -c @@ -44,11 +40,7 @@ spec: # mountPath: /etc/elastic-agent/inputs.d containers: - name: elastic-agent-standalone -<<<<<<< HEAD - image: docker.elastic.co/beats/elastic-agent:8.18.0 -======= - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0 ->>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724)) + image: docker.elastic.co/elastic-agent/elastic-agent:8.18.0 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/deploy/kubernetes/elastic-agent-kustomize/ksm-hints/elastic-agent-standalone/kustomization.yaml b/deploy/kubernetes/elastic-agent-kustomize/ksm-hints/elastic-agent-standalone/kustomization.yaml index 5868936445a..8544e8aab93 100644 --- a/deploy/kubernetes/elastic-agent-kustomize/ksm-hints/elastic-agent-standalone/kustomization.yaml +++ b/deploy/kubernetes/elastic-agent-kustomize/ksm-hints/elastic-agent-standalone/kustomization.yaml @@ -19,11 +19,7 @@ patches: spec: initContainers: - name: k8s-templates-downloader -<<<<<<< HEAD - image: docker.elastic.co/beats/elastic-agent:8.18.0 -======= - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0 ->>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724)) + image: docker.elastic.co/elastic-agent/elastic-agent:8.18.0 command: ['bash'] args: - -c diff --git a/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml b/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml index 32a989c5b5c..b67974990da 100644 --- a/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml +++ b/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml @@ -27,11 +27,7 @@ spec: dnsPolicy: ClusterFirstWithHostNet containers: - name: elastic-agent -<<<<<<< HEAD - image: docker.elastic.co/beats/elastic-agent:8.18.0 -======= - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0 ->>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724)) + image: docker.elastic.co/elastic-agent/elastic-agent:8.18.0 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/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml b/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml index b24b9166d6f..9960d0a55ca 100644 --- a/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml +++ b/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml @@ -704,11 +704,7 @@ spec: # Uncomment if using hints feature #initContainers: # - name: k8s-templates-downloader -<<<<<<< HEAD - # image: docker.elastic.co/beats/elastic-agent:8.18.0 -======= - # image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0 ->>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724)) + # image: docker.elastic.co/elastic-agent/elastic-agent:8.18.0 # command: ['bash'] # args: # - -c @@ -720,11 +716,7 @@ spec: # mountPath: /etc/elastic-agent/inputs.d containers: - name: elastic-agent-standalone -<<<<<<< HEAD - image: docker.elastic.co/beats/elastic-agent:8.18.0 -======= - image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0 ->>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724)) + image: docker.elastic.co/elastic-agent/elastic-agent:8.18.0 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 From 794f3354970490a0388d251faa012f1fa22332e6 Mon Sep 17 00:00:00 2001 From: Pierre HILBERT Date: Fri, 14 Feb 2025 08:48:01 +0100 Subject: [PATCH 3/3] Update README.md --- deploy/helm/elastic-agent/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/deploy/helm/elastic-agent/README.md b/deploy/helm/elastic-agent/README.md index 4ed1d1c6a71..e4142fa4ed3 100644 --- a/deploy/helm/elastic-agent/README.md +++ b/deploy/helm/elastic-agent/README.md @@ -146,7 +146,6 @@ The chart built-in [kubernetes integration](https://docs.elastic.co/integrations |-----|------|---------|-------------| | agent.version | string | `"8.18.0"` | elastic-agent version | | agent.image | object | `{"pullPolicy":"IfNotPresent","repository":"docker.elastic.co/elastic-agent/elastic-agent","tag":"8.18.0-SNAPSHOT"}` | image configuration | ->>>>>>> ed7c19f3b ([k8s] Correct agent image repository (#6724)) | 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 |