Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
46 changes: 19 additions & 27 deletions internal/cnpgi/operator/lifecycle.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"context"
"errors"
"fmt"
"slices"
"strings"

cnpgv1 "github.com/cloudnative-pg/cloudnative-pg/api/v1"
Expand Down Expand Up @@ -413,7 +414,7 @@ func reconcilePodSpec(
sidecarTemplate corev1.Container,
config sidecarConfiguration,
) error {
envs := make([]corev1.EnvVar, 0, 5+len(config.env))
envs := make([]corev1.EnvVar, 0, 5)
envs = append(envs,
corev1.EnvVar{
Name: "NAMESPACE",
Expand All @@ -439,8 +440,6 @@ func reconcilePodSpec(
},
)

envs = append(envs, config.env...)

baseProbe := &corev1.Probe{
PeriodSeconds: 1,
FailureThreshold: 30,
Expand Down Expand Up @@ -473,38 +472,18 @@ func reconcilePodSpec(
sidecarTemplate.Resources = config.resources
sidecarTemplate.Args = append(sidecarTemplate.Args, config.additionalArgs...)

sidecarTemplate.Env = appendMissingEnvs(sidecarTemplate.Env, config.env)

// merge the main container envs if they aren't already set
for _, container := range spec.Containers {
if container.Name == mainContainerName {
for _, env := range container.Env {
found := false
for _, existingEnv := range sidecarTemplate.Env {
if existingEnv.Name == env.Name {
found = true
break
}
}
if !found {
sidecarTemplate.Env = append(sidecarTemplate.Env, env)
}
}
sidecarTemplate.Env = appendMissingEnvs(sidecarTemplate.Env, container.Env)
break
}
}

// merge the default envs if they aren't already set
for _, env := range envs {
found := false
for _, existingEnv := range sidecarTemplate.Env {
if existingEnv.Name == env.Name {
found = true
break
}
}
if !found {
sidecarTemplate.Env = append(sidecarTemplate.Env, env)
}
}
sidecarTemplate.Env = appendMissingEnvs(sidecarTemplate.Env, envs)

if len(config.certificates) > 0 {
sidecarTemplate.VolumeMounts = ensureVolumeMount(
Expand Down Expand Up @@ -649,6 +628,19 @@ func ensureVolumeMount(mounts []corev1.VolumeMount, volumeMounts ...corev1.Volum
return mounts
}

// appendMissingEnvs appends the passed envs whose name is not already present in the list of envs.
func appendMissingEnvs(envs []corev1.EnvVar, incomingEnvs []corev1.EnvVar) []corev1.EnvVar {
for _, env := range incomingEnvs {
if !slices.ContainsFunc(envs, func(existingEnv corev1.EnvVar) bool {
return existingEnv.Name == env.Name
}) {
envs = append(envs, env)
}
}

return envs
}

// removeVolume removes a volume with a known name from a list of volumes.
func removeVolume(volumes []corev1.Volume, name string) []corev1.Volume {
var filteredVolumes []corev1.Volume
Expand Down
24 changes: 24 additions & 0 deletions internal/cnpgi/operator/lifecycle_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,30 @@ var _ = Describe("LifecycleImplementation", func() {
Expect(string(response.JsonPatch)).To(ContainSubstring(`"image":"custom:1"`))
})

It("prefers the configured sidecar envs over the main container ones", func(ctx SpecContext) {
pod := &corev1.Pod{
TypeMeta: podTypeMeta,
ObjectMeta: metav1.ObjectMeta{Name: "test-pod"},
Spec: corev1.PodSpec{Containers: []corev1.Container{{
Name: "postgres",
Env: []corev1.EnvVar{
{Name: "TMPDIR", Value: "/controller/tmp"},
{Name: "PGHOST", Value: "/controller/run"},
},
}}},
}
podJSON, _ := json.Marshal(pod)
request := &lifecycle.OperatorLifecycleRequest{ObjectDefinition: podJSON}

response, err := reconcileInstancePod(ctx, cluster, request, pluginConfiguration, sidecarConfiguration{
env: []corev1.EnvVar{{Name: "TMPDIR", Value: "/dev/shm"}},
})
Expect(err).NotTo(HaveOccurred())
Expect(string(response.JsonPatch)).To(ContainSubstring(`{"name":"TMPDIR","value":"/dev/shm"}`))
Expect(string(response.JsonPatch)).To(ContainSubstring(`{"name":"PGHOST","value":"/controller/run"}`))
Expect(string(response.JsonPatch)).NotTo(ContainSubstring(`"/controller/tmp"`))
})

It("injects the sidecar for a recovery-only cluster", func(ctx SpecContext) {
recoveryOnlyConfig := &config.PluginConfiguration{
RecoveryBarmanObjectName: "object-store-recovery",
Expand Down