marco/plugin-barman-cloud
1
0
Fork 0
mirror of https://github.com/cloudnative-pg/plugin-barman-cloud.git synced 2026-01-11 21:23:12 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simplify lookup to inject envs var on sidecar

Browse Source 
Use slices.Contains() instead of looping over existing envs vars and
others vars we want to add. This make that part easier to read.

Signed-off-by: Julian Vanden Broeck <julian.vandenbroeck@dalibo.com>
This commit is contained in:
Julian Vanden Broeck 2025-03-10 23:08:24 +01:00
parent 51e4dc00ab
commit 89b16e5078
No known key found for this signature in database
GPG Key ID: 9BFC389F5EBFA8A2
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
internal/cnpgi/operator/lifecycle.go
View File

@ -4,6 +4,7 @@ import (
"context"
"errors"
"fmt"
"slices"
cnpgv1 "github.com/cloudnative-pg/cloudnative-pg/api/v1"
"github.com/cloudnative-pg/cloudnative-pg/pkg/utils"
@ -331,31 +332,16 @@ func reconcilePodSpec(
for _, container := range spec.Containers {
if container.Name == mainContainerName {
for _, env := range container.Env {
found := false
for _, existingEnv := range sidecarConfig.Env {
if existingEnv.Name == env.Name {
found = true
break
}
}
if !found {
if !slices.Contains(sidecarConfig.Env, env) {
sidecarConfig.Env = append(sidecarConfig.Env, env)
}
}
break
}
}
// merge the default envs if they aren't already set
for _, env := range envs {
found := false
for _, existingEnv := range sidecarConfig.Env {
if existingEnv.Name == env.Name {
found = true
break
}
}
if !found {
if !slices.Contains(sidecarConfig.Env, env) {
sidecarConfig.Env = append(sidecarConfig.Env, env)
}
}