From 89b16e5078f5221e94cf4c9d59ad5fd3991ab17d Mon Sep 17 00:00:00 2001 From: Julian Vanden Broeck Date: Mon, 10 Mar 2025 23:08:24 +0100 Subject: [PATCH] Simplify lookup to inject envs var on sidecar 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 --- internal/cnpgi/operator/lifecycle.go | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/internal/cnpgi/operator/lifecycle.go b/internal/cnpgi/operator/lifecycle.go index 28e1e90..a6b0d56 100644 --- a/internal/cnpgi/operator/lifecycle.go +++ b/internal/cnpgi/operator/lifecycle.go @@ -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) } }