Skip to content

Commit db7e6bb

Browse files
authored
Wait for host ports to be exposed for all Chip Ingress services (#2034)
1 parent 1b7782a commit db7e6bb

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Wait for host ports to be exposed for all Chip Ingress services

framework/components/dockercompose/chip_ingress_set/chip_ingress.go

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,15 +107,22 @@ func New(in *Input) (*Output, error) {
107107

108108
stack.WaitForService(DEFAULT_CHIP_INGRESS_SERVICE_NAME,
109109
wait.ForAll(
110-
wait.ForLog("GRPC server is live").WithPollInterval(200*time.Millisecond),
111-
wait.ForListeningPort(DEFAULT_CHIP_INGRESS_GRPC_PORT),
112-
).WithDeadline(1*time.Minute),
110+
wait.ForLog("GRPC server is live").WithPollInterval(100*time.Millisecond),
111+
wait.ForListeningPort(DEFAULT_CHIP_INGRESS_GRPC_PORT).WithPollInterval(100*time.Millisecond),
112+
wait.NewHostPortStrategy(DEFAULT_CHIP_INGRESS_GRPC_PORT).WithPollInterval(100*time.Millisecond),
113+
).WithDeadline(2*time.Minute),
113114
).WaitForService(DEFAULT_RED_PANDA_SERVICE_NAME,
114115
wait.ForAll(
115-
wait.ForListeningPort(DEFAULT_RED_PANDA_SCHEMA_REGISTRY_PORT).WithStartupTimeout(1*time.Minute),
116-
wait.ForListeningPort(DEFAULT_RED_PANDA_KAFKA_PORT).WithStartupTimeout(1*time.Minute)),
116+
wait.ForListeningPort(DEFAULT_RED_PANDA_SCHEMA_REGISTRY_PORT).WithPollInterval(100*time.Millisecond),
117+
wait.ForListeningPort(DEFAULT_RED_PANDA_KAFKA_PORT).WithPollInterval(100*time.Millisecond),
118+
wait.NewHostPortStrategy(DEFAULT_RED_PANDA_SCHEMA_REGISTRY_PORT).WithPollInterval(100*time.Millisecond),
119+
wait.NewHostPortStrategy(DEFAULT_RED_PANDA_KAFKA_PORT).WithPollInterval(100*time.Millisecond),
120+
).WithDeadline(2*time.Minute),
117121
).WaitForService(DEFAULT_RED_PANDA_CONSOLE_SERVICE_NAME,
118-
wait.ForListeningPort(DEFAULT_RED_PANDA_CONSOLE_PORT).WithStartupTimeout(1*time.Minute),
122+
wait.ForAll(
123+
wait.ForListeningPort(DEFAULT_RED_PANDA_CONSOLE_PORT).WithPollInterval(100*time.Millisecond),
124+
wait.NewHostPortStrategy(DEFAULT_RED_PANDA_CONSOLE_PORT).WithPollInterval(100*time.Millisecond),
125+
).WithDeadline(2*time.Minute),
119126
)
120127

121128
chipIngressContainer, ingressErr := stack.ServiceContainer(ctx, DEFAULT_CHIP_INGRESS_SERVICE_NAME)

0 commit comments

Comments
 (0)