Skip to content

Commit

Permalink
chore: change image refs to support multi arch (#33)
Browse files Browse the repository at this point in the history
## Description
The `registry.opensource.zalan.do` registry does not support multi arch
images so we are actually packaging the amd64 image for arm64 arch and
running the operator on arm fails with `stderr F exec
/postgres-operator: exec format error`

This PR changes to zolando's ghcr packages except for `pgbouncer` which
was not available there so changed to the bitnami image from docker.io
instead. This should get all the images supporting multi arch for
upstream.

## Type of change

- [x] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Other (security config, docs update, etc)

## Checklist before merging

- [ ] Test, docs, adr added or updated as needed
- [ ] [Contributor Guide
Steps](https://github.com/defenseunicorns/uds-package-postgres-operator/blob/main/CONTRIBUTING.md#developer-workflow)
followed
Release-As: v1.11.0-uds.1
  • Loading branch information
ericwyles committed Jun 7, 2024
1 parent 1d8056a commit 963a962
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
10 changes: 5 additions & 5 deletions tasks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ includes:
- cleanup: ./tasks/cleanup.yaml
- dependencies: ./tasks/dependencies.yaml
- test: ./tasks/test.yaml
- create: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.4.0/tasks/create.yaml
- lint: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.4.0/tasks/lint.yaml
- pull: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.4.0/tasks/pull.yaml
- deploy: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.4.0/tasks/deploy.yaml
- setup: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.4.0/tasks/setup.yaml
- create: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.4.5/tasks/create.yaml
- lint: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.4.5/tasks/lint.yaml
- pull: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.4.5/tasks/pull.yaml
- deploy: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.4.5/tasks/deploy.yaml
- setup: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.4.5/tasks/setup.yaml

tasks:
- name: default
Expand Down
4 changes: 2 additions & 2 deletions tasks/publish.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
includes:
- create: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.4.0/tasks/create.yaml
- publish: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.4.0/tasks/publish.yaml
- create: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.4.5/tasks/create.yaml
- publish: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.4.5/tasks/publish.yaml

tasks:
- name: package
Expand Down
8 changes: 4 additions & 4 deletions values/upstream-values.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
image:
registry: registry.opensource.zalan.do
repository: acid/postgres-operator
registry: ghcr.io
repository: zalando/postgres-operator
configConnectionPooler:
connection_pooler_image: "registry.opensource.zalan.do/acid/pgbouncer:master-27"
connection_pooler_image: "docker.io/bitnami/pgbouncer:1.21.0"
configLogicalBackup:
logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup:v1.11.0"
logical_backup_docker_image: "ghcr.io/zalando/postgres-operator/logical-backup:v1.11.0"
configGeneral:
docker_image: "ghcr.io/zalando/spilo-15:3.2-p1"
6 changes: 3 additions & 3 deletions zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ components:
valuesFiles:
- ./values/upstream-values.yaml
images:
- registry.opensource.zalan.do/acid/postgres-operator:v1.11.0
- registry.opensource.zalan.do/acid/logical-backup:v1.11.0
- registry.opensource.zalan.do/acid/pgbouncer:master-27
- ghcr.io/zalando/postgres-operator:v1.11.0
- ghcr.io/zalando/postgres-operator/logical-backup:v1.11.0
- docker.io/bitnami/pgbouncer:1.21.0
# Docker image that provides PostgreSQL and Patroni bundled together for PostgreSQL HA
- ghcr.io/zalando/spilo-15:3.2-p1

0 comments on commit 963a962

Please sign in to comment.