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

[helm] derive the lease name from the release and preset names #5939

Merged
merged 1 commit into from
Nov 5, 2024
Merged

[helm] derive the lease name from the release and preset names #5939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 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 @@ -76,6 +76,7 @@ stringData:
scope: cluster
kubernetes_leaderelection:
enabled: true
leader_lease: example-clusterwide
inputs:
- data_stream:
namespace: default
Expand Down Expand Up @@ -127,6 +128,7 @@ stringData:
enabled: false
kubernetes_leaderelection:
enabled: false
leader_lease: example-ksmsharded
inputs:
- data_stream:
namespace: default
Expand Down Expand Up @@ -417,6 +419,7 @@ stringData:
scope: node
kubernetes_leaderelection:
enabled: false
leader_lease: example-pernode
inputs:
- data_stream:
namespace: default
Expand Down
3 changes: 2 additions & 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 @@ -32,6 +32,7 @@ stringData:
providers:
kubernetes_leaderelection:
enabled: false
leader_lease: example-nginx
---
# Source: elastic-agent/templates/agent/cluster-role.yaml
apiVersion: rbac.authorization.k8s.io/v1
Expand Down Expand Up @@ -181,7 +182,7 @@ spec:
labels:
name: agent-nginx-example
annotations:
checksum/config: ce25762427c9b6e207de5327b69be314f9d077db8138b7b241fd40f7b8a80aca
checksum/config: 975ed05540e0d099fe1b28b15d6403aacee676d0776a69fb75eb8624e19ad2de
spec:
automountServiceAccountToken: true
containers:
Expand Down
9 changes: 6 additions & 3 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 @@ -94,6 +94,7 @@ stringData:
scope: cluster
kubernetes_leaderelection:
enabled: true
leader_lease: example-clusterwide
---
# Source: elastic-agent/templates/agent/k8s/secret.yaml
apiVersion: v1
Expand Down Expand Up @@ -388,6 +389,7 @@ stringData:
enabled: false
kubernetes_leaderelection:
enabled: false
leader_lease: example-ksmsharded
---
# Source: elastic-agent/templates/agent/k8s/secret.yaml
apiVersion: v1
Expand Down Expand Up @@ -571,6 +573,7 @@ stringData:
scope: node
kubernetes_leaderelection:
enabled: false
leader_lease: example-pernode
---
# Source: elastic-agent/templates/agent/cluster-role.yaml
apiVersion: rbac.authorization.k8s.io/v1
Expand Down Expand Up @@ -1089,7 +1092,7 @@ spec:
labels:
name: agent-pernode-example
annotations:
checksum/config: d361521be4fd034ea920a15f80ef519e05c00d801973175e3f165ea714931b52
checksum/config: 233affcd72143e637a130b5f099c30e194d90042eb00a26512f51c844c65a821
spec:
automountServiceAccountToken: true
containers:
Expand Down Expand Up @@ -1209,7 +1212,7 @@ spec:
labels:
name: agent-clusterwide-example
annotations:
checksum/config: 14177955837470abb34597058889ea1f1d34ded25b5271b0dbbfb0bc8f3161c9
checksum/config: 97e62ed0d731dea2ecadf31b0a7b4160db1b8a253589b7324f3a381af2519591
spec:
automountServiceAccountToken: true
containers:
Expand Down Expand Up @@ -1291,7 +1294,7 @@ spec:
labels:
name: agent-ksmsharded-example
annotations:
checksum/config: 58c52f37c9e2582e270e0c3b5c0150252db79a8a1be4e9b287da943a7c9e3bdf
checksum/config: 3b64edf7317419b11b0aef4cd10cad04037b7bc0b6866da25871b47b41c04490
spec:
automountServiceAccountToken: true
containers:
Expand Down
9 changes: 6 additions & 3 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 @@ -94,6 +94,7 @@ stringData:
scope: cluster
kubernetes_leaderelection:
enabled: true
leader_lease: example-clusterwide
---
# Source: elastic-agent/templates/agent/k8s/secret.yaml
apiVersion: v1
Expand Down Expand Up @@ -388,6 +389,7 @@ stringData:
enabled: false
kubernetes_leaderelection:
enabled: false
leader_lease: example-ksmsharded
---
# Source: elastic-agent/templates/agent/k8s/secret.yaml
apiVersion: v1
Expand Down Expand Up @@ -573,6 +575,7 @@ stringData:
scope: node
kubernetes_leaderelection:
enabled: false
leader_lease: example-pernode
---
# Source: elastic-agent/templates/agent/cluster-role.yaml
apiVersion: rbac.authorization.k8s.io/v1
Expand Down Expand Up @@ -1091,7 +1094,7 @@ spec:
labels:
name: agent-pernode-example
annotations:
checksum/config: c9823ca6e0ab0a28164ee0111de74d3225480f5c5e81057159d3276ad3208f46
checksum/config: 0df24cb5f7362916ba8cb10621b123918f22f52a7ce9f0b0514c5983de6d06f3
spec:
automountServiceAccountToken: true
containers:
Expand Down Expand Up @@ -1236,7 +1239,7 @@ spec:
labels:
name: agent-clusterwide-example
annotations:
checksum/config: 14177955837470abb34597058889ea1f1d34ded25b5271b0dbbfb0bc8f3161c9
checksum/config: 97e62ed0d731dea2ecadf31b0a7b4160db1b8a253589b7324f3a381af2519591
spec:
automountServiceAccountToken: true
containers:
Expand Down Expand Up @@ -1318,7 +1321,7 @@ spec:
labels:
name: agent-ksmsharded-example
annotations:
checksum/config: 58c52f37c9e2582e270e0c3b5c0150252db79a8a1be4e9b287da943a7c9e3bdf
checksum/config: 3b64edf7317419b11b0aef4cd10cad04037b7bc0b6866da25871b47b41c04490
spec:
automountServiceAccountToken: true
containers:
Expand Down
3 changes: 2 additions & 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 @@ -104,6 +104,7 @@ stringData:
scope: node
kubernetes_leaderelection:
enabled: false
leader_lease: example-pernode
---
# Source: elastic-agent/templates/agent/cluster-role.yaml
apiVersion: rbac.authorization.k8s.io/v1
Expand Down Expand Up @@ -227,7 +228,7 @@ spec:
labels:
name: agent-pernode-example
annotations:
checksum/config: 10cb3f4c3996f9ccaee8461e274a694fbbb03df6437e46d293cc515296b00cc0
checksum/config: 0840dcdf026f64cefb7aa69f420bc923d7e2d7d6e9a239e107fd2684e309d8ae
spec:
automountServiceAccountToken: true
containers:
Expand Down
9 changes: 6 additions & 3 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 @@ -120,6 +120,7 @@ stringData:
scope: cluster
kubernetes_leaderelection:
enabled: true
leader_lease: example-clusterwide
---
# Source: elastic-agent/templates/agent/k8s/secret.yaml
apiVersion: v1
Expand Down Expand Up @@ -414,6 +415,7 @@ stringData:
enabled: false
kubernetes_leaderelection:
enabled: false
leader_lease: example-ksmsharded
---
# Source: elastic-agent/templates/agent/k8s/secret.yaml
apiVersion: v1
Expand Down Expand Up @@ -599,6 +601,7 @@ stringData:
scope: node
kubernetes_leaderelection:
enabled: false
leader_lease: example-pernode
---
# Source: elastic-agent/templates/agent/cluster-role.yaml
apiVersion: rbac.authorization.k8s.io/v1
Expand Down Expand Up @@ -1117,7 +1120,7 @@ spec:
labels:
name: agent-pernode-example
annotations:
checksum/config: c9823ca6e0ab0a28164ee0111de74d3225480f5c5e81057159d3276ad3208f46
checksum/config: 0df24cb5f7362916ba8cb10621b123918f22f52a7ce9f0b0514c5983de6d06f3
spec:
automountServiceAccountToken: true
containers:
Expand Down Expand Up @@ -1252,7 +1255,7 @@ spec:
labels:
name: agent-clusterwide-example
annotations:
checksum/config: 7cd88cef1c964a3660d069d4525c2efc0eed06607e0011c2af83a37648fcaacc
checksum/config: 4425148664b320184754e6ab2438144cdda5ec331ba76501a4264ddcab801623
spec:
automountServiceAccountToken: true
containers:
Expand Down Expand Up @@ -1324,7 +1327,7 @@ spec:
labels:
name: agent-ksmsharded-example
annotations:
checksum/config: 58c52f37c9e2582e270e0c3b5c0150252db79a8a1be4e9b287da943a7c9e3bdf
checksum/config: 3b64edf7317419b11b0aef4cd10cad04037b7bc0b6866da25871b47b41c04490
spec:
automountServiceAccountToken: true
containers:
Expand Down
3 changes: 2 additions & 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 @@ -66,6 +66,7 @@ stringData:
providers:
kubernetes_leaderelection:
enabled: false
leader_lease: example-nginx
---
# Source: elastic-agent/templates/agent/cluster-role.yaml
apiVersion: rbac.authorization.k8s.io/v1
Expand Down Expand Up @@ -215,7 +216,7 @@ spec:
labels:
name: agent-nginx-example
annotations:
checksum/config: 627f26ad8791a17274403b380c484441f4b4667f49d72057b17921707be49b0c
checksum/config: 99eaac30ab163ab5f4cedbdbf3e6936d34c2b0e2c22dee59947487bab88fcc26
spec:
automountServiceAccountToken: true
containers:
Expand Down
3 changes: 2 additions & 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 @@ -176,6 +176,7 @@ stringData:
scope: node
kubernetes_leaderelection:
enabled: false
leader_lease: example-pernode
---
# Source: elastic-agent/templates/agent/cluster-role.yaml
apiVersion: rbac.authorization.k8s.io/v1
Expand Down Expand Up @@ -299,7 +300,7 @@ spec:
labels:
name: agent-pernode-example
annotations:
checksum/config: 2c282d47af61943389605343bda01a73669627e940b9c563e4a678dfcbaa0c73
checksum/config: 535875b1a8f244fc529158f3467dec1983ca2ef19d365518da249fd46e22d0ef
spec:
automountServiceAccountToken: true
containers:
Expand Down
12 changes: 12 additions & 0 deletions deploy/helm/elastic-agent/templates/agent/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,18 @@ Validate and initialise the defined agent presets
{{- end -}}
{{- end -}}
{{- end -}}
{{/* by default we disable leader election but we also set the name of the leader lease in case it is explicitly enabled */}}
{{- if empty ($presetVal).providers -}}
{{- $_ := set $presetVal "providers" dict -}}
{{- end -}}
{{- $presetProviders := get $presetVal "providers" -}}
{{- if empty ($presetProviders).kubernetes_leaderelection -}}
{{- $_ := set $presetProviders "kubernetes_leaderelection" dict -}}
{{- end -}}
{{- $presetLeaderLeaseName := (printf "%s-%s" $.Release.Name $presetName) | lower -}}
{{- $defaultLeaderElection := dict "enabled" false "leader_lease" $presetLeaderLeaseName -}}
{{- $presetLeaderElection := mergeOverwrite dict $defaultLeaderElection ($presetProviders).kubernetes_leaderelection -}}
{{- $_ := set $presetProviders "kubernetes_leaderelection" $presetLeaderElection -}}
{{- end -}}
{{- end -}}

Expand Down
4 changes: 0 additions & 4 deletions deploy/helm/elastic-agent/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,8 +450,6 @@ agent:
logs: true
metrics: true
providers:
kubernetes_leaderelection:
enabled: false
kubernetes:
node: ${NODE_NAME}
scope: node
Expand Down Expand Up @@ -481,7 +479,5 @@ agent:
logs: true
metrics: true
providers:
kubernetes_leaderelection:
enabled: false
kubernetes:
enabled: false