Skip to content

fix: conditional for disabled postgres #199

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

Draft
codyshoffner wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

fix: conditional for disabled postgres #199

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f906aa
fix: conditional for disabled postgres
codyshoffner May 20, 2026
9058a57
Merge branch 'main' into fix/postgres-disabled-flag
codyshoffner May 21, 2026
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
21 changes: 14 additions & 7 deletions common/zarf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,12 @@ components:
onDeploy:
before:
# this shims postgres operator versions v0.11.1-uds.1 and below to the new config chart namespace layout
- cmd: ./zarf tools kubectl annotate --overwrite postgresql -n postgres pg-cluster meta.helm.sh/release-namespace=postgres-operator || true
- cmd: ./zarf tools kubectl annotate --overwrite service -n postgres pg-cluster-headless meta.helm.sh/release-namespace=postgres-operator || true
- cmd: ./zarf tools kubectl annotate --overwrite package -n postgres postgres meta.helm.sh/release-namespace=postgres-operator || true
- cmd: |
if ./zarf tools kubectl get namespace postgres 2>/dev/null; then
./zarf tools kubectl annotate --overwrite postgresql -n postgres pg-cluster meta.helm.sh/release-namespace=postgres-operator || true
./zarf tools kubectl annotate --overwrite service -n postgres pg-cluster-headless meta.helm.sh/release-namespace=postgres-operator || true
./zarf tools kubectl annotate --overwrite package -n postgres postgres meta.helm.sh/release-namespace=postgres-operator || true
fi
after:
- description: Validate Postgres Operator Package
maxTotalSeconds: 300
Expand All @@ -40,8 +43,10 @@ components:
- description: Validate Postgres Package
maxTotalSeconds: 300
cmd: |
if ./zarf tools kubectl get packages.uds.dev postgres -n postgres; then
./zarf tools wait-for packages.uds.dev postgres -n postgres '{.status.phase}'=Ready
if ./zarf tools kubectl get namespace postgres 2>/dev/null; then
if ./zarf tools kubectl get packages.uds.dev postgres -n postgres; then
./zarf tools wait-for packages.uds.dev postgres -n postgres '{.status.phase}'=Ready
fi
fi
- description: Postgres Operator to be Healthy
maxTotalSeconds: 90
Expand All @@ -54,6 +59,8 @@ components:
- description: Wait for Postgres cluster to be Running if postgresql.enabled is true
maxTotalSeconds: 300
cmd: |
if ./zarf tools kubectl get postgresql pg-cluster -n postgres; then
./zarf tools wait-for postgresql pg-cluster -n postgres '{.status.PostgresClusterStatus}'=Running
if ./zarf tools kubectl get namespace postgres 2>/dev/null; then
if ./zarf tools kubectl get postgresql pg-cluster -n postgres; then
./zarf tools wait-for postgresql pg-cluster -n postgres '{.status.PostgresClusterStatus}'=Running
fi
fi
Loading