Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[k8s] Correct agent image repository #6724

Merged
merged 4 commits into from
Feb 13, 2025
Merged

[k8s] Correct agent image repository #6724

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
50f7967
fix: correct agent image repository
pkoutsovasilis Feb 6, 2025
cc1bc74
fix: update agent image repository in more places
pkoutsovasilis Feb 6, 2025
bac9b64
fix default docker image repository
pchila Feb 6, 2025
ad9cc04
Merge branch 'main' into k8s/fix_agent_image
pkoutsovasilis Feb 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deploy/helm/edot-collector/kube-stack/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ crds:
create: true # Install the OpenTelemetry Operator CRDs.
defaultCRConfig:
image:
repository: "docker.elastic.co/beats/elastic-agent"
repository: "docker.elastic.co/elastic-agent/elastic-agent"
tag: "9.1.0"
targetAllocator:
enabled: false # Enable/disable the Operator's Target allocator.
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/elastic-agent/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
4 changes: 2 additions & 2 deletions deploy/helm/elastic-agent/examples/eck/rendered/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -993,7 +993,7 @@ spec:
value: /usr/share/elastic-agent/state
- name: ELASTIC_NETINFO
value: "false"
image: docker.elastic.co/beats/elastic-agent:9.1.0-SNAPSHOT
image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT
imagePullPolicy: IfNotPresent
name: agent
resources:
Expand Down Expand Up @@ -1072,7 +1072,7 @@ spec:
value: /usr/share/elastic-agent/state
- name: ELASTIC_NETINFO
value: "false"
image: docker.elastic.co/beats/elastic-agent:9.1.0-SNAPSHOT
image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT
imagePullPolicy: IfNotPresent
name: agent
resources:
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/elastic-agent/examples/fleet-managed-ksm-sharding/rendered/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ spec:
value: "false"
- name: FLEET_ENROLL
value: "1"
image: docker.elastic.co/beats/elastic-agent:9.1.0-SNAPSHOT
image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT
imagePullPolicy: IfNotPresent
name: agent
resources:
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/elastic-agent/examples/fleet-managed/rendered/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ spec:
value: "false"
- name: FLEET_ENROLL
value: "1"
image: docker.elastic.co/beats/elastic-agent:9.1.0-SNAPSHOT
image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT
imagePullPolicy: IfNotPresent
name: agent
resources:
Expand Down
4 changes: 2 additions & 2 deletions deploy/helm/elastic-agent/examples/kubernetes-default/rendered/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -909,7 +909,7 @@ spec:
value: /usr/share/elastic-agent/state
- name: ELASTIC_NETINFO
value: "false"
image: docker.elastic.co/beats/elastic-agent:9.1.0-SNAPSHOT
image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT
imagePullPolicy: IfNotPresent
name: agent
resources:
Expand Down Expand Up @@ -1090,7 +1090,7 @@ spec:
value: /usr/share/elastic-agent/state
- name: ELASTIC_NETINFO
value: "false"
image: docker.elastic.co/beats/elastic-agent:9.1.0-SNAPSHOT
image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT
imagePullPolicy: IfNotPresent
name: agent
resources:
Expand Down
4 changes: 2 additions & 2 deletions deploy/helm/elastic-agent/examples/kubernetes-hints-autodiscover/rendered/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -912,7 +912,7 @@ spec:
value: /usr/share/elastic-agent/state
- name: ELASTIC_NETINFO
value: "false"
image: docker.elastic.co/beats/elastic-agent:9.1.0-SNAPSHOT
image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT
imagePullPolicy: IfNotPresent
name: agent
resources:
Expand Down Expand Up @@ -1093,7 +1093,7 @@ spec:
value: /usr/share/elastic-agent/state
- name: ELASTIC_NETINFO
value: "false"
image: docker.elastic.co/beats/elastic-agent:9.1.0-SNAPSHOT
image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT
imagePullPolicy: IfNotPresent
name: agent
resources:
Expand Down
6 changes: 3 additions & 3 deletions deploy/helm/elastic-agent/examples/kubernetes-ksm-sharding/rendered/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -980,7 +980,7 @@ spec:
secretKeyRef:
key: api_key
name: es-api-secret
image: docker.elastic.co/beats/elastic-agent:9.1.0-SNAPSHOT
image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT
imagePullPolicy: IfNotPresent
name: agent
resources:
Expand Down Expand Up @@ -1086,7 +1086,7 @@ spec:
secretKeyRef:
key: api_key
name: es-api-secret
image: docker.elastic.co/beats/elastic-agent:9.1.0-SNAPSHOT
image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT
imagePullPolicy: IfNotPresent
name: agent
resources:
Expand Down Expand Up @@ -1250,7 +1250,7 @@ spec:
secretKeyRef:
key: api_key
name: es-api-secret
image: docker.elastic.co/beats/elastic-agent:9.1.0-SNAPSHOT
image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT
imagePullPolicy: IfNotPresent
name: agent
resources:
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/elastic-agent/examples/kubernetes-only-logs/rendered/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ spec:
value: /usr/share/elastic-agent/state
- name: ELASTIC_NETINFO
value: "false"
image: docker.elastic.co/beats/elastic-agent:9.1.0-SNAPSHOT
image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT
imagePullPolicy: IfNotPresent
name: agent
resources:
Expand Down
4 changes: 2 additions & 2 deletions deploy/helm/elastic-agent/examples/multiple-integrations/rendered/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -938,7 +938,7 @@ spec:
value: /usr/share/elastic-agent/state
- name: ELASTIC_NETINFO
value: "false"
image: docker.elastic.co/beats/elastic-agent:9.1.0-SNAPSHOT
image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT
imagePullPolicy: IfNotPresent
name: agent
resources:
Expand Down Expand Up @@ -1109,7 +1109,7 @@ spec:
value: /usr/share/elastic-agent/state
- name: ELASTIC_NETINFO
value: "false"
image: docker.elastic.co/beats/elastic-agent:9.1.0-SNAPSHOT
image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT
imagePullPolicy: IfNotPresent
name: agent
resources:
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/elastic-agent/examples/netflow-service/rendered/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ spec:
secretKeyRef:
key: api_key
name: es-api-secret
image: docker.elastic.co/beats/elastic-agent:9.1.0-SNAPSHOT
image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT
imagePullPolicy: IfNotPresent
name: agent
ports:
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/elastic-agent/examples/nginx-custom-integration/rendered/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ spec:
fieldPath: metadata.name
- name: STATE_PATH
value: /usr/share/elastic-agent/state
image: docker.elastic.co/beats/elastic-agent:9.1.0-SNAPSHOT
image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT
imagePullPolicy: IfNotPresent
name: agent
securityContext:
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/elastic-agent/examples/system-custom-auth-paths/rendered/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ spec:
value: /usr/share/elastic-agent/state
- name: ELASTIC_NETINFO
value: "false"
image: docker.elastic.co/beats/elastic-agent:9.1.0-SNAPSHOT
image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT
imagePullPolicy: IfNotPresent
name: agent
resources:
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/elastic-agent/examples/user-cluster-role/rendered/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ spec:
fieldPath: metadata.name
- name: STATE_PATH
value: /usr/share/elastic-agent/state
image: docker.elastic.co/beats/elastic-agent:9.1.0-SNAPSHOT
image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT
imagePullPolicy: IfNotPresent
name: agent
securityContext:
Expand Down
4 changes: 2 additions & 2 deletions deploy/helm/elastic-agent/examples/user-service-account/rendered/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -889,7 +889,7 @@ spec:
value: /usr/share/elastic-agent/state
- name: ELASTIC_NETINFO
value: "false"
image: docker.elastic.co/beats/elastic-agent:9.1.0-SNAPSHOT
image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT
imagePullPolicy: IfNotPresent
name: agent
resources:
Expand Down Expand Up @@ -1070,7 +1070,7 @@ spec:
value: /usr/share/elastic-agent/state
- name: ELASTIC_NETINFO
value: "false"
image: docker.elastic.co/beats/elastic-agent:9.1.0-SNAPSHOT
image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0-SNAPSHOT
imagePullPolicy: IfNotPresent
name: agent
resources:
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/elastic-agent/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.1.0-SNAPSHOT"
# -- image pull secrets
Expand Down
2 changes: 1 addition & 1 deletion ...c-agent-kustomize/default/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
dnsPolicy: ClusterFirstWithHostNet
containers:
- name: elastic-agent
image: docker.elastic.co/beats/elastic-agent:9.1.0
image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0
env:
# Set to 1 for enrollment into Fleet server. If not set, Elastic Agent is run in standalone mode
- name: FLEET_ENROLL
Expand Down
4 changes: 2 additions & 2 deletions ...t-kustomize/default/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ spec:
# Uncomment if using hints feature
#initContainers:
# - name: k8s-templates-downloader
# image: docker.elastic.co/beats/elastic-agent:9.1.0
# image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0
# command: ['bash']
# args:
# - -c
Expand All @@ -40,7 +40,7 @@ spec:
# mountPath: /etc/elastic-agent/inputs.d
containers:
- name: elastic-agent-standalone
image: docker.elastic.co/beats/elastic-agent:9.1.0
image: docker.elastic.co/elastic-agent/elastic-agent:9.1.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
Expand Down
2 changes: 1 addition & 1 deletion ...ustomize/ksm-autosharding/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
dnsPolicy: ClusterFirstWithHostNet
containers:
- name: elastic-agent
image: docker.elastic.co/beats/elastic-agent:9.1.0
image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0
env:
# Set to 1 for enrollment into Fleet server. If not set, Elastic Agent is run in standalone mode
- name: FLEET_ENROLL
Expand Down
2 changes: 1 addition & 1 deletion ...omize/ksm-autosharding/elastic-agent-managed/extra/elastic-agent-managed-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
dnsPolicy: ClusterFirstWithHostNet
containers:
- name: elastic-agent
image: docker.elastic.co/beats/elastic-agent:9.1.0
image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0
env:
# Set to 1 for enrollment into Fleet server. If not set, Elastic Agent is run in standalone mode
- name: FLEET_ENROLL
Expand Down
4 changes: 2 additions & 2 deletions ...ze/ksm-autosharding/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ spec:
# Uncomment if using hints feature
#initContainers:
# - name: k8s-templates-downloader
# image: docker.elastic.co/beats/elastic-agent:9.1.0
# image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0
# command: ['bash']
# args:
# - -c
Expand All @@ -40,7 +40,7 @@ spec:
# mountPath: /etc/elastic-agent/inputs.d
containers:
- name: elastic-agent-standalone
image: docker.elastic.co/beats/elastic-agent:9.1.0
image: docker.elastic.co/elastic-agent/elastic-agent:9.1.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
Expand Down
4 changes: 2 additions & 2 deletions ...ksm-autosharding/elastic-agent-standalone/extra/elastic-agent-standalone-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ spec:
# Uncomment if using hints feature
#initContainers:
# - name: k8s-templates-downloader
# image: docker.elastic.co/beats/elastic-agent:9.1.0
# image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0
# command: ['bash']
# args:
# - -c
Expand All @@ -40,7 +40,7 @@ spec:
# mountPath: /etc/elastic-agent/inputs.d
containers:
- name: elastic-agent-standalone
image: docker.elastic.co/beats/elastic-agent:9.1.0
image: docker.elastic.co/elastic-agent/elastic-agent:9.1.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
Expand Down
3 changes: 1 addition & 2 deletions .../kubernetes/elastic-agent-kustomize/ksm-hints/elastic-agent-standalone/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ patches:
spec:
initContainers:
- name: k8s-templates-downloader
image: docker.elastic.co/beats/elastic-agent:9.1.0
image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0
command: ['bash']
args:
- -c
Expand All @@ -37,4 +37,3 @@ patches:
volumes:
- name: external-inputs
emptyDir: {}

3 changes: 1 addition & 2 deletions ...es/elastic-agent-kustomize/ksm-hints/elastic-agent-standalone/kustomization.yaml.original
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -37,4 +37,3 @@ patches:
volumes:
- name: external-inputs
emptyDir: {}

2 changes: 1 addition & 1 deletion deploy/kubernetes/elastic-agent-managed-kubernetes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
dnsPolicy: ClusterFirstWithHostNet
containers:
- name: elastic-agent
image: docker.elastic.co/beats/elastic-agent:9.1.0
image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0
env:
# Set to 1 for enrollment into Fleet server. If not set, Elastic Agent is run in standalone mode
- name: FLEET_ENROLL
Expand Down
2 changes: 1 addition & 1 deletion deploy/kubernetes/elastic-agent-managed/elastic-agent-managed-daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,7 +697,7 @@ spec:
# Uncomment if using hints feature
#initContainers:
# - name: k8s-templates-downloader
# image: docker.elastic.co/beats/elastic-agent:9.1.0
# image: docker.elastic.co/elastic-agent/elastic-agent:9.1.0
# command: ['bash']
# args:
# - -c
Expand All @@ -709,7 +709,7 @@ spec:
# mountPath: /etc/elastic-agent/inputs.d
containers:
- name: elastic-agent-standalone
image: docker.elastic.co/beats/elastic-agent:9.1.0
image: docker.elastic.co/elastic-agent/elastic-agent:9.1.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
Expand Down
4 changes: 2 additions & 2 deletions deploy/kubernetes/elastic-agent-standalone/elastic-agent-standalone-daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Loading