Skip to content

Properly handle Patroni bootstrap_labels config#1093

Merged
hughcapet merged 2 commits intotriggerfrom
patroni-bootstrap-labels
Mar 7, 2025
Merged

Properly handle Patroni bootstrap_labels config#1093
hughcapet merged 2 commits intotriggerfrom
patroni-bootstrap-labels

Conversation

@hughcapet
Copy link
Copy Markdown
Member

@hughcapet hughcapet commented Mar 6, 2025

Allow configuration of patroni.kubernetes.bootstrap_labels via Spilo

@hughcapet hughcapet added the minor label Mar 6, 2025
@hughcapet hughcapet force-pushed the patroni-bootstrap-labels branch from 8a53a6b to c624ff8 Compare March 6, 2025 15:12
@hughcapet hughcapet marked this pull request as ready for review March 6, 2025 20:14
@hughcapet hughcapet force-pushed the patroni-bootstrap-labels branch 2 times, most recently from f931584 to 928da9c Compare March 7, 2025 12:58
@hughcapet hughcapet changed the base branch from master to trigger March 7, 2025 14:42
@hughcapet hughcapet force-pushed the patroni-bootstrap-labels branch from 928da9c to 3cf6ecb Compare March 7, 2025 14:48
@idanovinda
Copy link
Copy Markdown
Member

idanovinda commented Mar 7, 2025

👍

macedigital
macedigital reviewed Mar 7, 2025
View reviewed changes
Comment thread postgres-appliance/scripts/configure_spilo.py
Comment on lines +798 to +802
try:
tags = json.loads(os.getenv('LOG_S3_TAGS'))
except (TypeError, ValueError) as e:
logging.warning("could not parse LOG_S3_TAGS as a JSON: %r, reverting to the default empty dict", e)
tags = {}
Copy link
Copy Markdown
Member

@macedigital macedigital Mar 7, 2025

Choose a reason for hiding this comment

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

This is unrelated to the bootstrap-label changes, but makes a lot of sense to be more careful with parsing those strings.

@macedigital
Copy link
Copy Markdown
Member

macedigital commented Mar 7, 2025

👍

@zalando-robot
Copy link
Copy Markdown

zalando-robot commented Mar 7, 2025

  • Step skipped by user pbungina.

@hughcapet hughcapet merged commit bb1a86f into trigger Mar 7, 2025
6 checks passed
@hughcapet hughcapet deleted the patroni-bootstrap-labels branch March 7, 2025 19:52
@hughcapet hughcapet mentioned this pull request Mar 10, 2025
Merged
@hughcapet hughcapet mentioned this pull request Aug 6, 2025
Merged
hughcapet added a commit that referenced this pull request Aug 6, 2025
@hughcapet
Sync master with the latest changes from trigger branch (#1149)
7cb50bd 
- wal-g 3.0.5 (not 3.0.7, see: #1133)
- Support deleting old backups regardless of the current backup tool - #1133, #1150
- Make Spilo ipv6 compatible (on AWS) - #1108, #1109, #1112, #1113, #1117, #1123
- remove spilo_cmd - #1147
- add roaringbitmap and pgfaceting extensions - #1101, #1107
- add KUBERNETES_BOOTSTRAP_LABELS env for the upcoming Patroni feature - #1093, #1097
- fix LOG_S3_TAGS parsing logic - #1093
pando85 pushed a commit to pando85/spilo that referenced this pull request Aug 18, 2025
@hughcapet @pando85
Sync master with the latest changes from trigger branch (zalando#1149)
03db4b2 
- wal-g 3.0.5 (not 3.0.7, see: zalando#1133)
- Support deleting old backups regardless of the current backup tool - zalando#1133, zalando#1150
- Make Spilo ipv6 compatible (on AWS) - zalando#1108, zalando#1109, zalando#1112, zalando#1113, zalando#1117, zalando#1123
- remove spilo_cmd - zalando#1147
- add roaringbitmap and pgfaceting extensions - zalando#1101, zalando#1107
- add KUBERNETES_BOOTSTRAP_LABELS env for the upcoming Patroni feature - zalando#1093, zalando#1097
- fix LOG_S3_TAGS parsing logic - zalando#1093
pando85 pushed a commit to pando85/spilo that referenced this pull request Aug 18, 2025
@hughcapet @pando85
Sync master with the latest changes from trigger branch (zalando#1149)
bc18e1b 
- wal-g 3.0.5 (not 3.0.7, see: zalando#1133)
- Support deleting old backups regardless of the current backup tool - zalando#1133, zalando#1150
- Make Spilo ipv6 compatible (on AWS) - zalando#1108, zalando#1109, zalando#1112, zalando#1113, zalando#1117, zalando#1123
- remove spilo_cmd - zalando#1147
- add roaringbitmap and pgfaceting extensions - zalando#1101, zalando#1107
- add KUBERNETES_BOOTSTRAP_LABELS env for the upcoming Patroni feature - zalando#1093, zalando#1097
- fix LOG_S3_TAGS parsing logic - zalando#1093
ldming added a commit to apecloud-inc/spilo that referenced this pull request Apr 5, 2026
@ldming @hughcapet
@nickmansrob @idanovinda
chore: support postgresql 18 (#17)
c501306 
* fix: wrong regex for wal retention (zalando#1026) (zalando#1058)

Co-authored-by: Rob Nickmans <nickmansrob@gmail.com>

* Add pg17 and remove pg12 in trigger (zalando#1059)

* Update Patroni to version 3.3.5 (zalando#1068)

* Pass TIMESCALEDB argument as environment variable (zalando#1069)

* sync trigger branch (zalando#1076)

* Patroni 4.0
* timescaledb 2.18.0

* Adjust timescaledb to 2.18.0 in delivery (zalando#1078)

* Sync trigger 03-05 (zalando#1080)

- Fix timescaledb installation logic
- Make leader tag value for native AWS configurable
- Retain multiple minor versions of timescaledb

---------
Co-authored-by: idanovinda <idanovinda@gmail.com>

* Properly handle Patroni bootstrap_labels config (zalando#1093)

Additionally fix LOG_S3_TAGS parsing logic

* Set proper default KUBERNETES_BOOTSTRAP_LABELS (zalando#1097)

* Add pg_roaringbitmap and pgfaceting (zalando#1101)

* Add roaringbitmap to extwlist (zalando#1107)

* Correctly format URLs when address is IPv6 (zalando#1108)

Signed-off-by: Mikkel Oscar Lyderik Larsen <mikkel.larsen@zalando.de>

* Enable ipv6 on AWS (zalando#1109)

- keep AWS_EC2_METADATA_SERVICE* envs to enable wal-g
- use custom wal-e

* Move AWS_EC2_METADATA_SERVICE_ENDPOINT* env vars to env files (zalando#1112)

* Write imds env files for all prefixes (zalando#1113)

* Add trailing slash to AWS_EC2_METADATA_SERVICE_ENDPOINT (zalando#1117)

To support older boto3 versions

* Fix AWS_EC2_METADATA_SERVICE_ENDPOINT* env handling (zalando#1123)

* Write AWS_EC2_METADATA_SERVICE_ENDPOINT* env files only when actually needed

* Add pgvector to extension whitelist to allow non-superuser creation (zalando#1127)

* Updating wal-g version v3.0.5->v3.0.7 (zalando#1134)

* fix download url and use ubuntu 22.04 for wal-g (zalando#1135)

* Support deleting old backups regardless of the current tool (zalando#1133)

* fix wal-g download url and use ubuntu 20.04 (zalando#1141)

* Enable build image for arm64 in pull request (zalando#1144)

* remove spilo_cmd directory (zalando#1147)

* fix sorting (zalando#1150)

* pg_profile 4.10 and Patroni 4.0.6 (zalando#1151)

* Update postgis to version 3.6 (zalando#1153)

* Remove WAL-E and make WAL-G the default backup tool (zalando#1143)

* pg_basebackup server compression (zalando#1155)

* Allow admin selecting from hypopg views (zalando#1162)

* Add PG18, remove PG13 (zalando#1156)

- PG18 support
- Fix extension's build caching problem, which causes wrong pgversion symbols in extension's *.so
- Improve logic for timescaledb minor versions cleanup
- Build bg_mon from source

Not included for PG18:
- pglogical-ticker
- pgl-ddl-deploy

---------

Signed-off-by: Mikkel Oscar Lyderik Larsen <mikkel.larsen@zalando.de>
Co-authored-by: Polina Bungina <27892524+hughcapet@users.noreply.github.com>
Co-authored-by: Rob Nickmans <nickmansrob@gmail.com>
Co-authored-by: Ida Novindasari <idanovinda@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@macedigital macedigital macedigital left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

minor

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@hughcapet @idanovinda @macedigital @zalando-robot