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

chore: review

Browse Source 
Signed-off-by: Francesco Canovai <francesco.canovai@enterprisedb.com>
This commit is contained in:
Francesco Canovai 2024-10-23 17:44:39 +02:00 committed by Leonardo Cecchi
parent 6067121c67
commit 53be5ae896
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -336,7 +336,15 @@ func InjectPluginSidecarPodSpec(
if spec.Containers[i].Name == mainContainerName { if spec.Containers[i].Name == mainContainerName {
volumeMounts = spec.Containers[i].VolumeMounts volumeMounts = spec.Containers[i].VolumeMounts
mainContainerFound = true mainContainerFound = true
} else if spec.Containers[i].Name == sidecar.Name { }
}
if !mainContainerFound {
return errors.New("main container not found")
}
for i := range spec.InitContainers {
if spec.InitContainers[i].Name == sidecar.Name {
sidecarContainerFound = true sidecarContainerFound = true
} }
} }
@ -346,10 +354,6 @@ func InjectPluginSidecarPodSpec(
return nil return nil
} }
if !mainContainerFound {
return errors.New("main container not found")
}
// Do not modify the passed sidecar definition // Do not modify the passed sidecar definition
if injectMainContainerVolumes { if injectMainContainerVolumes {
sidecar.VolumeMounts = append(sidecar.VolumeMounts, volumeMounts...) sidecar.VolumeMounts = append(sidecar.VolumeMounts, volumeMounts...)

4
scripts/run.sh
View File

@ -13,8 +13,8 @@ MYTMPDIR="$(mktemp -d)"
trap 'rm -rf -- "$MYTMPDIR"' EXIT trap 'rm -rf -- "$MYTMPDIR"' EXIT
current_context=$(kubectl config view --raw -o json | jq -r '."current-context"' | sed "s/kind-//") current_context=$(kubectl config view --raw -o json | jq -r '."current-context"' | sed "s/kind-//")
operator_image=$(KIND_CLUSTER_NAME="$current_context" KO_DOCKER_REPO=kind.local ko build -BP ./cmd/operator) operator_image=$(KIND_CLUSTER_NAME="$current_context" KO_DOCKER_REPO=kind.local ko build -BP ./cmd/manager)
instance_image=$(KIND_CLUSTER_NAME="$current_context" KO_DOCKER_REPO=kind.local KO_DEFAULTBASEIMAGE="ghcr.io/cloudnative-pg/postgresql:17.0" ko build -BP ./cmd/instance) instance_image=$(KIND_CLUSTER_NAME="$current_context" KO_DOCKER_REPO=kind.local KO_DEFAULTBASEIMAGE="ghcr.io/cloudnative-pg/postgresql:17.0" ko build -BP ./cmd/manager)
# Now we deploy the plugin inside the `cnpg-system` workspace # Now we deploy the plugin inside the `cnpg-system` workspace
( (