Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions pkg/resource-handler/controller/shard/containers.go
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,6 @@ func buildMultiPoolerSidecar(
"--table-group=" + string(shard.Spec.TableGroupName),
"--shard=" + string(shard.Spec.ShardName),
"--service-id=$(POD_NAME)", // Use pod name as unique service ID
"--hostname=$(POD_NAME)", // Register with short pod name instead of FQDN
"--pgctld-addr=localhost:15470",
"--pg-port=5432",
"--connpool-admin-password=$(CONNPOOL_ADMIN_PASSWORD)", // Resolved from env var below
Expand Down Expand Up @@ -332,7 +331,7 @@ func buildMultiOrchContainer(shard *multigresv1alpha1.Shard, cellName string) co
}

// TODO: Add remaining command line arguments:
// --log-level, --log-output, --hostname
// --log-level, --log-output

// TODO: Verify correct format for --watch-targets flag.
// Currently using static "postgres" based on demo, but may need to be:
Expand Down
3 changes: 0 additions & 3 deletions pkg/resource-handler/controller/shard/containers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ func TestBuildMultiPoolerSidecar(t *testing.T) {
"--table-group=default",
"--shard=0",
"--service-id=$(POD_NAME)",
"--hostname=$(POD_NAME)",
"--pgctld-addr=localhost:15470",
"--pg-port=5432",
"--connpool-admin-password=$(CONNPOOL_ADMIN_PASSWORD)",
Expand Down Expand Up @@ -161,7 +160,6 @@ func TestBuildMultiPoolerSidecar(t *testing.T) {
"--table-group=orders",
"--shard=1",
"--service-id=$(POD_NAME)",
"--hostname=$(POD_NAME)",
"--pgctld-addr=localhost:15470",
"--pg-port=5432",
"--connpool-admin-password=$(CONNPOOL_ADMIN_PASSWORD)",
Expand Down Expand Up @@ -276,7 +274,6 @@ func TestBuildMultiPoolerSidecar(t *testing.T) {
"--table-group=default",
"--shard=0",
"--service-id=$(POD_NAME)",
"--hostname=$(POD_NAME)",
"--pgctld-addr=localhost:15470",
"--pg-port=5432",
"--connpool-admin-password=$(CONNPOOL_ADMIN_PASSWORD)",
Expand Down
Loading