Skip to content

Commit

Permalink
[k8s] Correct agent image repository (#6724)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
pkoutsovasilis authored and mergify[bot] committed Feb 13, 2025
1 parent 553e67f commit 08dfa65
Show file tree
Hide file tree
Showing 34 changed files with 2,125 additions and 17 deletions.
5 changes: 5 additions & 0 deletions deploy/helm/edot-collector/kube-stack/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,13 @@ crds:
create: true # Install the OpenTelemetry Operator CRDs.
defaultCRConfig:
image:
<<<<<<< HEAD
repository: "docker.elastic.co/beats/elastic-agent"
tag: "8.16.5"
=======
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
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/elastic-agent/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,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 |
Expand Down
8 changes: 8 additions & 0 deletions deploy/helm/elastic-agent/examples/eck/rendered/manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1100,7 +1100,11 @@ spec:
value: /usr/share/elastic-agent/state
- name: ELASTIC_NETINFO
value: "false"
<<<<<<< HEAD
image: docker.elastic.co/beats/elastic-agent:8.16.5-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:
Expand Down Expand Up @@ -1203,7 +1207,11 @@ spec:
value: /usr/share/elastic-agent/state
- name: ELASTIC_NETINFO
value: "false"
<<<<<<< HEAD
image: docker.elastic.co/beats/elastic-agent:8.16.5-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:
Expand Down
Loading

0 comments on commit 08dfa65

Please sign in to comment.