Skip to content

Commit

Permalink
Use a PodTemplate resource in the Helm Chart (#5831)
Browse files Browse the repository at this point in the history
* Use PodTemplate resource in the Helm Chart

* Remove unnecessary named template

* Use PodTemplate resource in the Helm Chart for ECK

(cherry picked from commit f891fb0)

# Conflicts:
#	deploy/helm/elastic-agent/examples/eck/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-only-logs/rendered/manifest.yaml
#	deploy/helm/elastic-agent/examples/multiple-integrations/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
  • Loading branch information
swiatekm committed Nov 5, 2024
1 parent a6ffb80 commit dde8dc5
Show file tree
Hide file tree
Showing 17 changed files with 1,373 additions and 1,358 deletions.
383 changes: 190 additions & 193 deletions deploy/helm/elastic-agent/examples/eck/rendered/manifest.yaml

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -228,100 +228,100 @@ spec:
name: agent-pernode-example
annotations:
checksum/config: 4de2216224a483ae1355aeec668894f764edc48bd3481d8fbc65f67eedc1b336

spec:
dnsPolicy: ClusterFirstWithHostNet
automountServiceAccountToken: true
nodeSelector:
kubernetes.io/os: linux
serviceAccountName: agent-pernode-example
volumes:
- hostPath:
path: /proc
containers:
- args:
- -c
- /etc/elastic-agent/agent.yml
- -e
env:
- name: NODE_NAME
valueFrom:
fieldRef:
fieldPath: spec.nodeName
- name: POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: STATE_PATH
value: /usr/share/elastic-agent/state
- name: ELASTIC_NETINFO
value: "false"
image: docker.elastic.co/beats/elastic-agent:8.16.0-SNAPSHOT
imagePullPolicy: IfNotPresent
name: agent
resources:
limits:
memory: 1000Mi
requests:
cpu: 100m
memory: 400Mi
securityContext:
capabilities:
add:
- DAC_READ_SEARCH
- CHOWN
- SETPCAP
- SYS_PTRACE
drop:
- ALL
privileged: false
runAsGroup: 1000
runAsUser: 1000
volumeMounts:
- mountPath: /hostfs/proc
name: proc
- hostPath:
path: /sys/fs/cgroup
readOnly: true
- mountPath: /hostfs/sys/fs/cgroup
name: cgroup
- hostPath:
path: /var/lib/docker/containers
readOnly: true
- mountPath: /var/lib/docker/containers
name: varlibdockercontainers
- hostPath:
path: /var/log
readOnly: true
- mountPath: /var/log
name: varlog
- hostPath:
path: /etc
readOnly: true
- mountPath: /hostfs/etc
name: etc-full
- hostPath:
path: /var/lib
readOnly: true
- mountPath: /hostfs/var/lib
name: var-lib
- name: agent-data
hostPath:

path: /etc/elastic-agent/default/agent-pernode-example/state
type: DirectoryOrCreate

- name: config
secret:
defaultMode: 0444
secretName: agent-pernode-example
containers:
- name: agent
imagePullPolicy: IfNotPresent
image: "docker.elastic.co/beats/elastic-agent:8.16.0-SNAPSHOT"
args: ["-c", "/etc/elastic-agent/agent.yml", "-e"]
securityContext:
capabilities:
add:
- DAC_READ_SEARCH
- CHOWN
- SETPCAP
- SYS_PTRACE
drop:
- ALL
privileged: false
runAsGroup: 1000
runAsUser: 1000
resources:
limits:
memory: 1000Mi
requests:
cpu: 100m
memory: 400Mi
volumeMounts:
- mountPath: /hostfs/proc
name: proc
readOnly: true
- mountPath: /hostfs/sys/fs/cgroup
name: cgroup
readOnly: true
- mountPath: /var/lib/docker/containers
name: varlibdockercontainers
readOnly: true
- mountPath: /var/log
name: varlog
readOnly: true
- mountPath: /hostfs/etc
name: etc-full
readOnly: true
- mountPath: /hostfs/var/lib
name: var-lib
readOnly: true
- name: agent-data
mountPath: /usr/share/elastic-agent/state
- name: config
mountPath: /etc/elastic-agent/agent.yml
readOnly: true
subPath: agent.yml
env:
- name: NODE_NAME
valueFrom:
fieldRef:
fieldPath: spec.nodeName
- name: POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: STATE_PATH
value: "/usr/share/elastic-agent/state"
- name: ELASTIC_NETINFO
value: "false"
readOnly: true
- mountPath: /usr/share/elastic-agent/state
name: agent-data
- mountPath: /etc/elastic-agent/agent.yml
name: config
readOnly: true
subPath: agent.yml
dnsPolicy: ClusterFirstWithHostNet
nodeSelector:
kubernetes.io/os: linux
serviceAccountName: agent-pernode-example
volumes:
- hostPath:
path: /proc
name: proc
- hostPath:
path: /sys/fs/cgroup
name: cgroup
- hostPath:
path: /var/lib/docker/containers
name: varlibdockercontainers
- hostPath:
path: /var/log
name: varlog
- hostPath:
path: /etc
name: etc-full
- hostPath:
path: /var/lib
name: var-lib
- hostPath:
path: /etc/elastic-agent/default/agent-pernode-example/state
type: DirectoryOrCreate
name: agent-data
- name: config
secret:
defaultMode: 292
secretName: agent-pernode-example
Loading

0 comments on commit dde8dc5

Please sign in to comment.