Skip to content

K8SPG-613: use percona-pgbackrest image #1098

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hors merged 14 commits into from
Apr 2, 2025
Merged

K8SPG-613: use percona-pgbackrest image #1098

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
846797a
K8SPG-613: use percona-pgbackrest image
pooknull Mar 21, 2025
2859269
fix
pooknull Mar 21, 2025
6b96032
update image for tests
pooknull Mar 24, 2025
3606812
make generate
pooknull Mar 24, 2025
a5f5e64
Merge remote-tracking branch 'origin/main' into dev/K8SPG-613
pooknull Mar 24, 2025
cbc8d78
fix lint
pooknull Mar 25, 2025
ac73738
rebuild images
pooknull Mar 25, 2025
292ecad
fix lint
pooknull Mar 25, 2025
b64b7d1
Merge remote-tracking branch 'origin/main' into dev/K8SPG-613
pooknull Mar 25, 2025
97ce9a9
fix lint
pooknull Mar 27, 2025
018718a
add unit-tests
pooknull Apr 1, 2025
871b83e
Merge branch 'main' into dev/K8SPG-613
hors Apr 2, 2025
1a5669a
update yaml files
pooknull Apr 2, 2025
a75a3b9
Merge branch 'main' into dev/K8SPG-613
hors Apr 2, 2025
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
4 changes: 4 additions & 0 deletions build/crd/crunchy/generated/postgres-operator.crunchydata.com_postgresclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,8 @@ spec:
pgBackRest repository hosts and backups. The image may also be set using
the RELATED_IMAGE_PGBACKREST environment variable
type: string
initImage:
type: string
jobs:
description: Jobs field allows configuration for all backup
jobs
Expand Down Expand Up @@ -8400,6 +8402,8 @@ spec:
type: object
x-kubernetes-map-type: atomic
type: array
Copy link
Copy Markdown
Collaborator

@hors hors Mar 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please fix description

Copy link
Copy Markdown
Contributor Author

@pooknull pooknull Apr 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

018718a

initImage:
type: string
instances:
description: |-
Specifies one or more sets of PostgreSQL pods that replicate data for
Expand Down
4 changes: 4 additions & 0 deletions build/crd/percona/generated/pgv2.percona.com_perconapgclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,6 +545,8 @@ spec:
pgBackRest repository hosts and backups. The image may also be set using
the RELATED_IMAGE_PGBACKREST environment variable
type: string
initImage:
type: string
jobs:
description: Jobs field allows configuration for all backup
jobs
Expand Down Expand Up @@ -8201,6 +8203,8 @@ spec:
type: object
x-kubernetes-map-type: atomic
type: array
initImage:
type: string
instances:
description: |-
Specifies one or more sets of PostgreSQL pods that replicate data for
Expand Down
8 changes: 7 additions & 1 deletion build/postgres-operator/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,12 @@ RUN mkdir -p build/_output/bin \
go build -ldflags "-w -s -X main.GitCommit=$GIT_COMMIT -X main.GitBranch=$GIT_BRANCH -X main.BuildTime=$BUILD_TIME" \
-o build/_output/bin/extension-installer \
./cmd/extension-installer \
&& CGO_ENABLED=$PGBACKREST_CGO_ENABLED GOARCH=${TARGETARCH} GOOS=$GOOS GO_LDFLAGS=$GO_LDFLAGS \
go build \
-o build/_output/bin/pgbackrest ./cmd/pgbackrest \
&& cp -r build/_output/bin/postgres-operator /usr/local/bin/postgres-operator \
&& cp -r build/_output/bin/extension-installer /usr/local/bin/extension-installer
&& cp -r build/_output/bin/extension-installer /usr/local/bin/extension-installer \
&& cp -r build/_output/bin/pgbackrest /usr/local/bin/pgbackrest


RUN ./bin/license_aggregator.sh ./cmd/...; \
Expand All @@ -55,8 +59,10 @@ COPY licenses /licenses

COPY --from=go_builder /usr/local/bin/postgres-operator /usr/local/bin
COPY --from=go_builder /usr/local/bin/extension-installer /usr/local/bin
COPY --from=go_builder /usr/local/bin/pgbackrest /usr/local/bin/
COPY --from=go_builder /licenses /licenses
COPY build/postgres-operator/install-extensions.sh /usr/local/bin
COPY build/postgres-operator/init-entrypoint.sh /usr/local/bin
COPY hack/tools/queries /opt/crunchy/conf

RUN chgrp -R 0 /opt/crunchy/conf && chmod -R g=u opt/crunchy/conf
Expand Down
8 changes: 8 additions & 0 deletions build/postgres-operator/init-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/usr/bin/env bash

set -o errexit
set -o xtrace

CRUNCHY_BINDIR="/opt/crunchy"

install -o "$(id -u)" -g "$(id -g)" -m 0755 -D "/usr/local/bin/pgbackrest" "${CRUNCHY_BINDIR}/bin/pgbackrest"
Loading