Correct CLI arguments to match with upstream impl #108

rytswd · 2026-01-05T04:01:24Z

This assumes that multigres/multigres#447 is merged and the new pgctld container image is available at GHCR.

The deployment can be tested with the following commands

# Clone the repository
❯ git switch correct-cmd-args

# Make sure main.go uses the latest dependencies from local version
❯ go work init
❯ go work use . ./api ./pkg/cluster-handler ./pkg/resource-handler

# Create a new kind cluster, named multigres-operator-dev, and deploy operator and CRD resources
❯ make kind-deploy

# Get kubeconfig into a tmp directory
❯ kind get kubeconfig --name multigres-operator-dev > /tmp/kind-kubeconfig.yaml

# Deploy toposerver
❯ kubectl --kubeconfig /tmp/kind-kubeconfig.yaml apply -f pkg/resource-handler/e2e-config/kind-toposerver.yaml

# Use a Job to register to topo server, and also include observability stack
❯ kubectl --kubeconfig /tmp/kind-kubeconfig.yaml apply -f pkg/resource-handler/e2e-config/hack/

# Deploy sample child resources
❯ kubectl --kubeconfig /tmp/kind-kubeconfig.yaml apply -f pkg/resource-handler/e2e-config/

# Monitor with k9s
❯ k9s --kubeconfig /tmp/kind-kubeconfig.yaml

TODO:

Check the #439 Multigres upstream demo setup with the job for metadata handling in etcd
Backup with certs, there is another job setup
1 pool x 3 replicas for demo
1 cell + 1 topo is fine

Note on how to test and verify

MultiOrch should have the log indicating the successful (or failing) bootstrapping (or MultiPooler)

This currently defaults to "postgres" as per demo setup in the upstream repository.

rytswd · 2026-01-05T06:24:41Z

Included a wrong file in the commit, corrected with force push

rytswd · 2026-01-10T01:34:37Z

pkg/resource-handler/controller/shard/containers.go

This file is getting too large to maintain, with so many containers in a pod. I'll consider refactoring this after this PR is merged.

github-actions · 2026-01-10T01:51:42Z

🔬 Go Test Coverage Report

Summary

Coverage Type	Result
Threshold	0%
Previous Test Coverage	0.0%
New Test Coverage	100.0%

Status

✅ PASS

Detail

Show New Coverage

github.com/numtide/multigres-operator/pkg/resource-handler/controller/cell/cell_controller.go:32:		Reconcile			100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/cell/cell_controller.go:82:		handleDeletion			100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/cell/cell_controller.go:106:		reconcileMultiGatewayDeployment	100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/cell/cell_controller.go:140:		reconcileMultiGatewayService	100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/cell/cell_controller.go:175:		updateStatus			100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/cell/cell_controller.go:202:		buildConditions			100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/cell/cell_controller.go:237:		SetupWithManager		100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/cell/multigateway.go:38:			BuildMultiGatewayDeployment	100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/cell/multigateway.go:118:			BuildMultiGatewayService	100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/metadata/labels.go:95:			BuildStandardLabels		100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/metadata/labels.go:108:			AddCellLabel			100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/metadata/labels.go:114:			AddClusterLabel			100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/metadata/labels.go:120:			AddShardLabel			100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/metadata/labels.go:126:			AddDatabaseLabel		100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/metadata/labels.go:132:			AddTableGroupLabel		100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/metadata/labels.go:141:			MergeLabels			100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/shard/configmap.go:24:			BuildPgHbaConfigMap		100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/shard/containers.go:82:			buildSocketDirVolume		100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/shard/containers.go:92:			buildPgHbaVolume		100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/shard/containers.go:114:			buildPostgresContainer		100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/shard/containers.go:187:			buildPgctldContainer		100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/shard/containers.go:250:			buildMultiPoolerSidecar		100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/shard/containers.go:325:			buildPgctldInitContainer	100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/shard/containers.go:343:			buildMultiOrchContainer		100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/shard/containers.go:381:			buildPgctldVolume		100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/shard/containers.go:393:			buildBackupVolume		100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/shard/labels.go:11:			buildPoolLabelsWithCell		100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/shard/multiorch.go:24:			BuildMultiOrchDeployment	100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/shard/multiorch.go:72:			BuildMultiOrchService		100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/shard/multiorch.go:102:			buildMultiOrchNameWithCell	100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/shard/multiorch.go:107:			buildMultiOrchLabelsWithCell	100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/shard/pool_service.go:21:			BuildPoolHeadlessService	100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/shard/pool_service.go:56:			buildPoolNameWithCell		100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/shard/pool_statefulset.go:34:		BuildPoolStatefulSet		100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/shard/pool_statefulset.go:108:		buildPoolVolumeClaimTemplates	100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/shard/pool_statefulset.go:135:		BuildBackupPVC			100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/shard/ports.go:27:			buildMultiPoolerContainerPorts	100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/shard/ports.go:49:			buildPoolHeadlessServicePorts	100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/shard/ports.go:74:			buildMultiOrchContainerPorts	100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/shard/ports.go:91:			buildMultiOrchServicePorts	100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/shard/shard_controller.go:32:		Reconcile			100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/shard/shard_controller.go:109:		handleDeletion			100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/shard/shard_controller.go:133:		reconcileMultiOrchDeployment	100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/shard/shard_controller.go:172:		reconcilePgHbaConfigMap		100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/shard/shard_controller.go:209:		reconcileMultiOrchService	100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/shard/shard_controller.go:249:		reconcilePool			100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/shard/shard_controller.go:292:		reconcilePoolStatefulSet	100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/shard/shard_controller.go:332:		reconcilePoolBackupPVC		100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/shard/shard_controller.go:373:		reconcilePoolHeadlessService	100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/shard/shard_controller.go:414:		updateStatus			100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/shard/shard_controller.go:449:		updatePoolsStatus		100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/shard/shard_controller.go:486:		updateMultiOrchStatus		100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/shard/shard_controller.go:529:		cellSetToSlice			100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/shard/shard_controller.go:538:		buildConditions			100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/shard/shard_controller.go:568:		getMultiOrchCells		100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/shard/shard_controller.go:602:		SetupWithManager		100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/storage/pvc.go:19:			BuildPVCTemplate		100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/toposerver/container_env.go:13:		buildContainerEnv		100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/toposerver/container_env.go:41:		buildPodIdentityEnv		100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/toposerver/container_env.go:66:		buildEtcdConfigEnv		100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/toposerver/container_env.go:116:		buildEtcdClusterPeerList	100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/toposerver/ports.go:20:			buildContainerPorts		100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/toposerver/ports.go:48:			buildHeadlessServicePorts	100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/toposerver/ports.go:78:			buildClientServicePorts		100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/toposerver/service.go:17:			BuildHeadlessService		100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/toposerver/service.go:48:			BuildClientService		100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/toposerver/statefulset.go:39:		BuildStatefulSet		100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/toposerver/statefulset.go:118:		buildVolumeClaimTemplates	100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/toposerver/toposerver_controller.go:32:	Reconcile			100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/toposerver/toposerver_controller.go:91:	reconcileStatefulSet		100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/toposerver/toposerver_controller.go:128:	reconcileHeadlessService	100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/toposerver/toposerver_controller.go:166:	reconcileClientService		100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/toposerver/toposerver_controller.go:204:	updateStatus			100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/toposerver/toposerver_controller.go:234:	buildConditions			100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/toposerver/toposerver_controller.go:262:	handleDeletion			100.0%
github.com/numtide/multigres-operator/pkg/resource-handler/controller/toposerver/toposerver_controller.go:286:	SetupWithManager		100.0%
total:														(statements)			100.0%

rytswd · 2026-01-10T01:55:27Z

Making sure that we can test with the main branch, so going ahead with the merge for this one. We will make any refactoring and other adjustments later in a separate PR.

rytswd added 2 commits January 5, 2026 03:19

Correct resource CLI arguments

8da7761

Update pgctld copy to use different image

260d579

This comment has been minimized.

Sign in to view

rytswd added 5 commits January 5, 2026 06:23

Ensure watch-targets is passed down

600c0ec

This currently defaults to "postgres" as per demo setup in the upstream repository.

Correct image handling for multigateway

ba328fc

Correct CRD installation

ca4c7e5

Correct caching logic for coverage CI

b6f0b71

Merge remote-tracking branch 'origin/main' into correct-cmd-args

2de2e5e

rytswd force-pushed the correct-cmd-args branch from 2fcef8e to 2de2e5e Compare January 5, 2026 06:24

This comment has been minimized.

Sign in to view

rytswd added 3 commits January 5, 2026 06:31

Use server side apply for large CRD def

9d6dd13

Merge remote-tracking branch 'origin/main' into correct-cmd-args

07fbb17

Update database and tablegroup to be default

7194674

This comment has been minimized.

Sign in to view

rytswd added 4 commits January 5, 2026 15:44

Add note about MVP implementation

cd64f48

Correct topo server reference

2c8af2b

Add note about MVP demo specific env

a44f32c

Add e2e helper script for data-handler logic

d197ae0

This comment has been minimized.

Sign in to view

Correct target namespace

7cb9830

rytswd force-pushed the correct-cmd-args branch from 8dc12f7 to 7cb9830 Compare January 5, 2026 15:51

This comment has been minimized.

Sign in to view

rytswd added 3 commits January 6, 2026 10:33

Add temp env variable POSTGRES_HOST_AUTH_METHOD

ba775cd

Update pgctld image reference

a56ec95

Merge remote-tracking branch 'origin/main' into correct-cmd-args

3579585

rytswd added 15 commits January 9, 2026 13:06

Merge remote-tracking branch 'origin/main' into correct-cmd-args

461fdd0

Update api reference

721950a

Add explicit access modes

5cc1f8f

Add access mode handling for PVCs

6bfa5f0

Correct pgctld mount path

c8a032d

Correct socket path

8074979

Correct zone

56764f8

Correct socket dir input

dc21184

Correct pg_hba template

8fd7add

Correct zone in multiorch testing

aa5e2fc

Add access mode testing

18c96b6

Add backup volume

2f1a6da

Adjust test spec for postgres container

55306c1

Add all flags in integration test results

eae66ea

Add backup PVC related test cases

b8040f2

rytswd force-pushed the correct-cmd-args branch from a96d950 to b8040f2 Compare January 10, 2026 01:27

This comment has been minimized.

Sign in to view

Fix lint

e3e20b2

This comment has been minimized.

Sign in to view

Correct copy logic and comment

f3d7bb0

This comment has been minimized.

Sign in to view

Match test cases with updated impl

7c81547

This comment has been minimized.

Sign in to view

Remove old files

e686f25

rytswd commented Jan 10, 2026

View reviewed changes

rytswd merged commit 40fb79c into main Jan 10, 2026
3 checks passed

rytswd deleted the correct-cmd-args branch January 10, 2026 01:55

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Correct CLI arguments to match with upstream impl #108

Correct CLI arguments to match with upstream impl #108

Uh oh!

rytswd commented Jan 5, 2026 •

edited

Loading

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

rytswd commented Jan 5, 2026

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

rytswd Jan 10, 2026

Uh oh!

github-actions bot commented Jan 10, 2026

Uh oh!

rytswd commented Jan 10, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Correct CLI arguments to match with upstream impl #108

Correct CLI arguments to match with upstream impl #108

Uh oh!

Conversation

rytswd commented Jan 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Note on how to test and verify

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

rytswd commented Jan 5, 2026

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

rytswd Jan 10, 2026

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Jan 10, 2026

🔬 Go Test Coverage Report

Summary

Status

Detail

Uh oh!

rytswd commented Jan 10, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

rytswd commented Jan 5, 2026 •

edited

Loading