Skip to content

support dynamic host port allocation for ChIP Config container #2589

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

Merged
Tofel merged 3 commits into from
May 12, 2026
Merged

support dynamic host port allocation for ChIP Config container #2589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ebabce
support dynamic host port allocation for ChIP Config container
Tofel May 12, 2026
61d07c5
remove PR description generator, model doesn't exist any more
Tofel May 12, 2026
e8b63de
fix port env vars
Tofel May 12, 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
25 changes: 0 additions & 25 deletions .github/workflows/pr-description-ai.yml
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions framework/components/dockercompose/.changeset/v0.1.23.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Support dynamic host port allocation for Chip Config container
15 changes: 13 additions & 2 deletions framework/components/dockercompose/chip_ingress_set/chip_ingress.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ const (
DEFAULT_CHIP_INGRESS_GRPC_PORT = "50051"
DEFAULT_CHIP_INGRESS_SERVICE_NAME = "chip-ingress"

DEFAULT_CHIP_CONFIG_EXTERNAL_PORT = "50052"
DEFAULT_CHIP_CONFIG_INTERNAL_PORT = "50051"
DEFAULT_CHIP_CONFIG_SERVICE_NAME = "chip-config"
DEFAULT_CHIP_CONFIG_USERNAME = "admin"
Expand All @@ -86,6 +85,7 @@ const (
ChipIngressGRPCPortEnvVar = "CTF_CHIP_INGRESS_GRPC_PORT"
ChipIngressImageEnvVar = "CTF_CHIP_INGRESS_IMAGE"
ChipConfigImageEnvVar = "CTF_CHIP_CONFIG_IMAGE"
ChipConfigHostPortEnvVar = "CTF_CHIP_CONFIG_HOST_PORT"
)

func New(in *Input) (*Output, error) {
Expand Down Expand Up @@ -268,14 +268,25 @@ func NewWithContext(ctx context.Context, in *Input) (*Output, error) {
chipIngressGRPCHostPort = fmt.Sprintf("%d", port.Num())
}

var chipConfigHostPort string
if v, ok := envVars[ChipConfigHostPortEnvVar]; ok && v != "" {
chipConfigHostPort = v
} else {
port, pErr := chipConfigContainer.MappedPort(ctx, DEFAULT_CHIP_CONFIG_INTERNAL_PORT+"/tcp")
if pErr != nil {
return nil, errors.Wrap(pErr, "failed to get mapped port for Chip Config")
}
chipConfigHostPort = fmt.Sprintf("%d", port.Num())
}

output := &Output{
ChipIngress: &ChipIngressOutput{
GRPCInternalURL: fmt.Sprintf("%s:%s", DEFAULT_CHIP_INGRESS_SERVICE_NAME, chipIngressGRPCPort),
GRPCExternalURL: fmt.Sprintf("%s:%s", chipIngressExternalHost, chipIngressGRPCHostPort),
},
ChipConfig: &ChipConfigOutput{
GRPCInternalURL: fmt.Sprintf("%s:%s", DEFAULT_CHIP_CONFIG_SERVICE_NAME, DEFAULT_CHIP_CONFIG_INTERNAL_PORT),
GRPCExternalURL: fmt.Sprintf("%s:%s", chipConfigExternalHost, DEFAULT_CHIP_CONFIG_EXTERNAL_PORT),
GRPCExternalURL: fmt.Sprintf("%s:%s", chipConfigExternalHost, chipConfigHostPort),
Username: DEFAULT_CHIP_CONFIG_USERNAME,
Comment thread
Tofel marked this conversation as resolved.
Password: DEFAULT_CHIP_CONFIG_PASSWORD,
},
Expand Down
8 changes: 4 additions & 4 deletions framework/components/dockercompose/chip_ingress_set/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ services:
command: ["write-service"]
environment:
SERVER_HOST: "0.0.0.0"
SERVER_GRPC_PORT: "${CHIP_INGRESS_GRPC_PORT:-50051}"
SERVER_GRPC_PORT: "${CTF_CHIP_INGRESS_GRPC_PORT:-50051}"
SERVER_METRICS_PORT: "9090"
SERVER_HEALTHCHECKS_PORT: "9091"
SERVER_METRICS_IMPLEMENTATION: "otel"
Expand All @@ -39,12 +39,12 @@ services:
CHIP_CONFIG_HOST: ${CHIP_CONFIG_HOST:-chip-config}
CHIP_CONFIG_PORT: ${CHIP_CONFIG_PORT:-50051}
ports:
- "${CHIP_INGRESS_GRPC_HOST_PORT:-0}:${CHIP_INGRESS_GRPC_PORT:-50051}"
- "${CTF_CHIP_INGRESS_GRPC_HOST_PORT:-0}:${CTF_CHIP_INGRESS_GRPC_PORT:-50051}"
- "9090:9090"
- "9092:9091"
healthcheck:
# this has been modified from the original docker-compose.yml to use grpc_health_probe
test: [ "CMD", "grpc_health_probe", "-addr=localhost:${CHIP_INGRESS_GRPC_PORT:-50051}" ]
test: [ "CMD", "grpc_health_probe", "-addr=localhost:${CTF_CHIP_INGRESS_GRPC_PORT:-50051}" ]
interval: 1s
timeout: 10s
start_period: 15s
Expand All @@ -57,7 +57,7 @@ services:
command:
- start
ports:
- "50052:50051"
- "${CTF_CHIP_CONFIG_HOST_PORT:-0}:50051"
environment:
SCHEMA_REGISTRY_URL: http://redpanda-0:8081
# SERVER_METRICS_OTEL_EXPORTER_GRPC_ENDPOINT: otel-lgtm:4317
Expand Down
Loading