Skip to content

Commit

Permalink
feat: add unicorn flavor (#77)
Browse files Browse the repository at this point in the history
## Description

Adds a `unicorn` flavor to PGO

## Related Issue

Fixes #N/A

## Type of change

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

## Checklist before merging

- [X] Test, docs, adr added or updated as needed
- [X] [Contributor Guide
Steps](https://github.com/defenseunicorns/uds-package-postgres-operator/blob/main/CONTRIBUTING.md#developer-workflow)
followed
  • Loading branch information
Racer159 authored Oct 28, 2024
1 parent 575f539 commit 3f740e3
Show file tree
Hide file tree
Showing 7 changed files with 46 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
if: ${{ needs.tag-new-version.outputs.release_created == 'true' }}
strategy:
matrix:
flavor: [upstream, registry1]
flavor: [upstream, registry1, unicorn]
architecture: [amd64, arm64]
exclude:
- flavor: registry1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
fail-fast: true
matrix:
type: [install, upgrade]
flavor: [upstream, registry1]
flavor: [upstream, registry1, unicorn]
uses: defenseunicorns/uds-common/.github/workflows/callable-test.yaml@c52077c870a576d01f169f96d74d1b393c6488ba # v1.1.2
with:
upgrade-flavors: ${{ needs.check-flavor.outputs.upgrade-flavors }}
Expand Down
1 change: 1 addition & 0 deletions values/registry1-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
image:
registry: registry1.dso.mil
repository: ironbank/opensource/zalando/postgres-operator
tag: v1.13.0
configConnectionPooler:
connection_pooler_image: "registry1.dso.mil/ironbank/opensource/zalando/pgbouncer:1.21.0"
configLogicalBackup:
Expand Down
5 changes: 5 additions & 0 deletions values/unicorn-config-values.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Copyright 2024 Defense Unicorns
# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial

metrics:
image: "cgr.dev/du-uds-defenseunicorns/prometheus-postgres-exporter-fips:0.15.0"
13 changes: 13 additions & 0 deletions values/unicorn-values.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Copyright 2024 Defense Unicorns
# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial

image:
registry: cgr.dev
repository: du-uds-defenseunicorns/postgres-operator-fips
tag: "1.13.0"
configConnectionPooler:
connection_pooler_image: "cgr.dev/du-uds-defenseunicorns/pgbouncer-fips:1.22.1"
configLogicalBackup:
logical_backup_docker_image: "ghcr.io/zalando/postgres-operator/logical-backup:v1.13.0"
configGeneral:
docker_image: "ghcr.io/zalando/spilo-15:3.2-p1"
1 change: 1 addition & 0 deletions values/upstream-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
image:
registry: ghcr.io
repository: zalando/postgres-operator
tag: v1.13.0
configConnectionPooler:
connection_pooler_image: "docker.io/bitnami/pgbouncer:1.23.1"
configLogicalBackup:
Expand Down
26 changes: 24 additions & 2 deletions zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ components:
- registry1.dso.mil/ironbank/opensource/zalando/pgbouncer:1.21.0
# Docker image that provides PostgreSQL and Patroni bundled together for PostgreSQL HA
- ghcr.io/zalando/spilo-15:3.2-p1
# Container iamge that provides the postgres-exporter sidecar to create a metrics endpoint
# Container image that provides the postgres-exporter sidecar to create a metrics endpoint
- registry1.dso.mil/ironbank/opensource/prometheus/postgres-exporter:v0.15.0

- name: postgres-operator
Expand All @@ -65,5 +65,27 @@ components:
- docker.io/bitnami/pgbouncer:1.23.1
# Docker image that provides PostgreSQL and Patroni bundled together for PostgreSQL HA
- ghcr.io/zalando/spilo-15:3.2-p1
# Container iamge that provides the postgres-exporter sidecar to create a metrics endpoint
# Container image that provides the postgres-exporter sidecar to create a metrics endpoint
- quay.io/prometheuscommunity/postgres-exporter:v0.15.0

- name: postgres-operator
required: true
only:
flavor: unicorn
import:
path: common
charts:
- name: postgres-operator
valuesFiles:
- ./values/unicorn-values.yaml
- name: uds-postgres-config
valuesFiles:
- ./values/unicorn-config-values.yaml
images:
- cgr.dev/du-uds-defenseunicorns/postgres-operator-fips:1.13.0
- ghcr.io/zalando/postgres-operator/logical-backup:v1.13.0
- cgr.dev/du-uds-defenseunicorns/pgbouncer-fips:1.22.1
# Docker image that provides PostgreSQL and Patroni bundled together for PostgreSQL HA
- ghcr.io/zalando/spilo-15:3.2-p1
# Container image that provides the postgres-exporter sidecar to create a metrics endpoint
- cgr.dev/du-uds-defenseunicorns/prometheus-postgres-exporter-fips:0.15.0

0 comments on commit 3f740e3

Please sign in to comment.