Skip to content

Fly.io development #3

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

Open
jsierles wants to merge 16 commits into
base: main
Choose a base branch
from
Open

Fly.io development #3

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
25afc75
Add debug logging
Feb 20, 2025
23c9ae0
Build docker
Feb 20, 2025
b782594
fix
Feb 20, 2025
d3fbd57
Add Sentry
Feb 21, 2025
18ae773
Revert "Add Sentry"
Feb 21, 2025
739f353
Initialize sentry
Feb 21, 2025
0429af0
Add sentry again
Feb 21, 2025
07d64db
Add error tracking for backups
Feb 23, 2025
f4ef518
less tracking
Feb 23, 2025
ec3d974
Disable client throttling
Feb 26, 2025
777da3b
Support env vars on repoHost
Mar 6, 2025
fa2a3f9
Add option to delay the initial backup
Mar 6, 2025
976e192
Allow env and sidecars for repo host
Mar 6, 2025
9f33a5b
updated CRD
Mar 7, 2025
b222dae
Build for ARM
Mar 10, 2025
1d9278d
Allow setting env vars on intances and the repo host from secrets
Mar 11, 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
1,577 changes: 1,577 additions & 0 deletions build/crd/percona/generated/pgv2.percona.com_perconapgclusters.yaml
View file
Open in desktop

Large diffs are not rendered by default.

1,577 changes: 1,577 additions & 0 deletions config/crd/bases/pgv2.percona.com_perconapgclusters.yaml
View file
Open in desktop

Large diffs are not rendered by default.

18 changes: 15 additions & 3 deletions deploy/cr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,11 +379,23 @@ spec:
matchLabels:
postgres-operator.crunchydata.com/data: pgbackrest
topologyKey: kubernetes.io/hostname
env:
- name: AWS_WEB_IDENTITY_TOKEN_FILE
value: "/var/run/secrets/eks.amazonaws.com/serviceaccount/token"
- name: AWS_ROLE_ARN
value: "arn:aws:iam::123456789012:role/my-role"
# Add sidecars to the repo host pod
sidecars:
- name: s3-helper
image: amazon/aws-cli:latest
command: ["sleep"]
args: ["infinity"]
resources:
limits:
cpu: 100m
memory: 128Mi
# tolerations:
# - effect: NoSchedule
# key: role
# operator: Equal
# value: connection-poolers
# priorityClassName: high-priority
#
# topologySpreadConstraints:
Expand Down
11 changes: 10 additions & 1 deletion internal/controller/postgrescluster/pgbackrest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,9 +645,18 @@ func (r *Reconciler) generateRepoHostIntent(ctx context.Context, postgresCluster
postgresCluster.Spec.ImagePullPolicy,
&repo.Spec.Template)

// Add sidecars from the spec if defined
if pgbackrest := postgresCluster.Spec.Backups.PGBackRest; pgbackrest.RepoHost != nil &&
len(pgbackrest.RepoHost.Sidecars) > 0 {
// Add each sidecar container to the pod spec
repo.Spec.Template.Spec.Containers = append(
Copy link
Member

@senyosimpson senyosimpson Mar 11, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

fwiw, you'd actually want to add this to initContainers and have a restart policy set to Always for the container. that ensures it actually starts before the main program

repo.Spec.Template.Spec.Containers,
pgbackrest.RepoHost.Sidecars...)
}

resources := corev1.ResourceRequirements{}
if postgresCluster.Spec.Backups.PGBackRest.RepoHost != nil {
resources = postgresCluster.Spec.Backups.PGBackRest.RepoHost.Resources
resources = postgresCluster.Spec.Backups.PGBackRest.RepoHost.Resources
}
sizeLimit := getTMPSizeLimit(repo.Labels[naming.LabelVersion], resources)

Expand Down
Loading