Skip to content

Commit b96fb60

Browse files
authored
Fix ws-proxy pending (#20157)
1 parent 309a32e commit b96fb60

File tree

2 files changed

+1
-13
lines changed

2 files changed

+1
-13
lines changed

components/ws-proxy/pkg/config/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ func GetConfig(fn string) (*Config, error) {
7070
return nil, xerrors.Errorf("config validation error: %w", err)
7171
}
7272

73-
timeout := time.Minute * 5
73+
timeout := time.Second * 45
7474
log.WithField("timeout", timeout).Info("waiting for Feature Flag")
7575
experimentsClient := experiments.NewClient(experiments.WithPollInterval(time.Second * 3))
7676
ctx, cancel := context.WithTimeout(context.Background(), timeout)

install/installer/pkg/common/common.go

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -410,18 +410,6 @@ func ConfigcatEnv(ctx *RenderContext) []corev1.EnvVar {
410410
}
411411

412412
func ConfigcatEnvOutOfCluster(ctx *RenderContext) []corev1.EnvVar {
413-
var sdkKey string
414-
_ = ctx.WithExperimental(func(cfg *experimental.Config) error {
415-
if cfg.WebApp != nil && cfg.WebApp.ConfigcatKey != "" {
416-
sdkKey = cfg.WebApp.ConfigcatKey
417-
}
418-
return nil
419-
})
420-
421-
if sdkKey == "" {
422-
return nil
423-
}
424-
425413
return []corev1.EnvVar{
426414
{
427415
Name: "CONFIGCAT_SDK_KEY",

0 commit comments

Comments
 (0)