From 6ebabce1709afd757366a40ac12c61c76aecbfc5 Mon Sep 17 00:00:00 2001 From: Bartek Tofel Date: Tue, 12 May 2026 09:33:05 +0200 Subject: [PATCH 1/3] support dynamic host port allocation for ChIP Config container --- .../components/dockercompose/.changeset/v0.1.23.md | 1 + .../dockercompose/chip_ingress_set/chip_ingress.go | 14 +++++++++++++- .../chip_ingress_set/docker-compose.yml | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 framework/components/dockercompose/.changeset/v0.1.23.md diff --git a/framework/components/dockercompose/.changeset/v0.1.23.md b/framework/components/dockercompose/.changeset/v0.1.23.md new file mode 100644 index 000000000..d22029d11 --- /dev/null +++ b/framework/components/dockercompose/.changeset/v0.1.23.md @@ -0,0 +1 @@ +- Support dynamic host port allocation for Chip Config container \ No newline at end of file diff --git a/framework/components/dockercompose/chip_ingress_set/chip_ingress.go b/framework/components/dockercompose/chip_ingress_set/chip_ingress.go index 51ffaf442..214e559eb 100644 --- a/framework/components/dockercompose/chip_ingress_set/chip_ingress.go +++ b/framework/components/dockercompose/chip_ingress_set/chip_ingress.go @@ -86,6 +86,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) { @@ -268,6 +269,17 @@ 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 Ingress") + } + chipConfigHostPort = fmt.Sprintf("%d", port.Num()) + } + output := &Output{ ChipIngress: &ChipIngressOutput{ GRPCInternalURL: fmt.Sprintf("%s:%s", DEFAULT_CHIP_INGRESS_SERVICE_NAME, chipIngressGRPCPort), @@ -275,7 +287,7 @@ func NewWithContext(ctx context.Context, in *Input) (*Output, error) { }, 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, Password: DEFAULT_CHIP_CONFIG_PASSWORD, }, diff --git a/framework/components/dockercompose/chip_ingress_set/docker-compose.yml b/framework/components/dockercompose/chip_ingress_set/docker-compose.yml index 0015bd370..ecbd79dbd 100644 --- a/framework/components/dockercompose/chip_ingress_set/docker-compose.yml +++ b/framework/components/dockercompose/chip_ingress_set/docker-compose.yml @@ -57,7 +57,7 @@ services: command: - start ports: - - "50052:50051" + - "${CHIP_CONFIG_HOST_PORT:-0}:50051" environment: SCHEMA_REGISTRY_URL: http://redpanda-0:8081 # SERVER_METRICS_OTEL_EXPORTER_GRPC_ENDPOINT: otel-lgtm:4317 From 61d07c51010ff7c54343153f0de814f29049cde7 Mon Sep 17 00:00:00 2001 From: Bartek Tofel Date: Tue, 12 May 2026 09:35:46 +0200 Subject: [PATCH 2/3] remove PR description generator, model doesn't exist any more --- .github/workflows/pr-description-ai.yml | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 .github/workflows/pr-description-ai.yml diff --git a/.github/workflows/pr-description-ai.yml b/.github/workflows/pr-description-ai.yml deleted file mode 100644 index 6eda11db9..000000000 --- a/.github/workflows/pr-description-ai.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: PR Description Generator -on: - pull_request: - types: [opened, reopened, ready_for_review] - issue_comment: - # Reply to an existing PR to generate description (commenter requires PR write access) - # Requires `/gpt-create-pr` commands to invoke - types: [created] - -jobs: - llm-pr-generator: - runs-on: ubuntu-latest - permissions: - contents: read - pull-requests: write - repository-projects: read - steps: - - name: Generate PR Description - uses: smartcontractkit/.github/actions/llm-pr-writer@0dd7de0bab24dcc169499ac8c71f7315cc8ca98e # llm-pr-writer@0.3.1 - with: - gh-token: ${{ github.token }} - openai-api-key: ${{ secrets.OPENAI_API_KEY }} - openai-model: 'gpt-4-0125-preview' - exclude-paths: 'artifacts/*;target/*;' - workflow-ref: '763b4118dac59b74e3f4aef343918b7f334fb8a0' # 0.3.0 From e8b63de43a9e978c926ac26d1186b1d828e2ccc7 Mon Sep 17 00:00:00 2001 From: Bartek Tofel Date: Tue, 12 May 2026 09:49:59 +0200 Subject: [PATCH 3/3] fix port env vars --- .../dockercompose/chip_ingress_set/chip_ingress.go | 3 +-- .../dockercompose/chip_ingress_set/docker-compose.yml | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/framework/components/dockercompose/chip_ingress_set/chip_ingress.go b/framework/components/dockercompose/chip_ingress_set/chip_ingress.go index 214e559eb..e433a6ea0 100644 --- a/framework/components/dockercompose/chip_ingress_set/chip_ingress.go +++ b/framework/components/dockercompose/chip_ingress_set/chip_ingress.go @@ -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" @@ -275,7 +274,7 @@ func NewWithContext(ctx context.Context, in *Input) (*Output, error) { } 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 Ingress") + return nil, errors.Wrap(pErr, "failed to get mapped port for Chip Config") } chipConfigHostPort = fmt.Sprintf("%d", port.Num()) } diff --git a/framework/components/dockercompose/chip_ingress_set/docker-compose.yml b/framework/components/dockercompose/chip_ingress_set/docker-compose.yml index ecbd79dbd..0dd2acd9d 100644 --- a/framework/components/dockercompose/chip_ingress_set/docker-compose.yml +++ b/framework/components/dockercompose/chip_ingress_set/docker-compose.yml @@ -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" @@ -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 @@ -57,7 +57,7 @@ services: command: - start ports: - - "${CHIP_CONFIG_HOST_PORT:-0}: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