Skip to content

Commit

Permalink
fix: remove pointless uniq in helpers
Browse files Browse the repository at this point in the history
  • Loading branch information
pkoutsovasilis committed Nov 6, 2024
1 parent d5b7191 commit 8ce3bbf
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions deploy/helm/elastic-agent/templates/agent/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ Mutate an agent preset based on agent.fleet
{{- $_ := set $preset "extraEnvs" list -}}
{{- end -}}
{{- $presetEnvVars := get $preset "extraEnvs" -}}
{{- $presetEnvVars = uniq (concat $presetEnvVars $fleetEnvVars) -}}
{{- $presetEnvVars = concat $presetEnvVars $fleetEnvVars -}}
{{- $_ := set $preset "extraEnvs" $presetEnvVars -}}
{{- end -}}
{{- end -}}
Expand Down Expand Up @@ -287,7 +287,7 @@ app.kubernetes.io/version: {{ .Values.agent.version}}
{{- if eq ($preset).clusterRole.create true -}}
{{- $presetClusterRoleRules := dig "rules" (list) ($preset).clusterRole -}}
{{- $rulesToAdd := get (include $templateName $ | fromYaml) "rules" -}}
{{- $presetClusterRoleRules = uniq (concat $presetClusterRoleRules $rulesToAdd) -}}
{{- $presetClusterRoleRules = concat $presetClusterRoleRules $rulesToAdd -}}
{{- $_ := set ($preset).clusterRole "rules" $presetClusterRoleRules -}}
{{- end -}}
{{- end -}}
Expand All @@ -307,7 +307,7 @@ app.kubernetes.io/version: {{ .Values.agent.version}}
{{- $templateName := index . 2 -}}
{{- $presetContainers := dig "extraContainers" (list) $preset -}}
{{- $containersToAdd := get (include $templateName $ | fromYaml) "extraContainers"}}
{{- $presetContainers = uniq (concat $presetContainers $containersToAdd) -}}
{{- $presetContainers = concat $presetContainers $containersToAdd -}}
{{- $_ := set $preset "extraContainers" $presetContainers -}}
{{- end -}}

Expand All @@ -318,7 +318,7 @@ app.kubernetes.io/version: {{ .Values.agent.version}}
{{- $tolerationsToAdd := dig "tolerations" (list) (include $templateName $ | fromYaml) }}
{{- if $tolerationsToAdd -}}
{{- $presetTolerations := dig "tolerations" (list) $preset -}}
{{- $presetTolerations = uniq (concat $presetTolerations $tolerationsToAdd) -}}
{{- $presetTolerations = concat $presetTolerations $tolerationsToAdd -}}
{{- $_ := set $preset "tolerations" $tolerationsToAdd -}}
{{- end -}}
{{- end -}}
Expand All @@ -329,7 +329,7 @@ app.kubernetes.io/version: {{ .Values.agent.version}}
{{- $templateName := index . 2 -}}
{{- $presetInitContainers := dig "initContainers" (list) $preset -}}
{{- $initContainersToAdd := get (include $templateName $ | fromYaml) "initContainers"}}
{{- $presetInitContainers = uniq (concat $presetInitContainers $initContainersToAdd) -}}
{{- $presetInitContainers = concat $presetInitContainers $initContainersToAdd -}}
{{- $_ := set $preset "initContainers" $presetInitContainers -}}
{{- end -}}

Expand All @@ -339,7 +339,7 @@ app.kubernetes.io/version: {{ .Values.agent.version}}
{{- $templateName := index . 2 -}}
{{- $presetVolumes := dig "extraVolumes" (list) $preset -}}
{{- $volumesToAdd := get (include $templateName $ | fromYaml) "extraVolumes"}}
{{- $presetVolumes = uniq (concat $presetVolumes $volumesToAdd) -}}
{{- $presetVolumes = concat $presetVolumes $volumesToAdd -}}
{{- $_ := set $preset "extraVolumes" $presetVolumes -}}
{{- end -}}

Expand All @@ -349,7 +349,7 @@ app.kubernetes.io/version: {{ .Values.agent.version}}
{{- $templateName := index . 2 -}}
{{- $presetVolumeMounts := dig "extraVolumeMounts" (list) $preset -}}
{{- $volumeMountsToAdd := get (include $templateName $ | fromYaml) "extraVolumeMounts"}}
{{- $presetVolumeMounts = uniq (concat $presetVolumeMounts $volumeMountsToAdd) -}}
{{- $presetVolumeMounts = concat $presetVolumeMounts $volumeMountsToAdd -}}
{{- $_ := set $preset "extraVolumeMounts" $presetVolumeMounts -}}
{{- end -}}

Expand Down

0 comments on commit 8ce3bbf

Please sign in to comment.