Skip to content

Fix ws-proxy pending #20157

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
merged 1 commit into from
Aug 29, 2024
Merged

Fix ws-proxy pending #20157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion components/ws-proxy/pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ func GetConfig(fn string) (*Config, error) {
return nil, xerrors.Errorf("config validation error: %w", err)
}

timeout := time.Minute * 5
timeout := time.Second * 45
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pod will mark as crash (?) after around 1 minute not alive, so 5m here is make no sense.

As we plan to remove related code, we could check logs of ws-proxy to verify if feature is disabled

log.WithField("timeout", timeout).Info("waiting for Feature Flag")
experimentsClient := experiments.NewClient(experiments.WithPollInterval(time.Second * 3))
ctx, cancel := context.WithTimeout(context.Background(), timeout)
Expand Down
12 changes: 0 additions & 12 deletions install/installer/pkg/common/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,18 +410,6 @@ func ConfigcatEnv(ctx *RenderContext) []corev1.EnvVar {
}

func ConfigcatEnvOutOfCluster(ctx *RenderContext) []corev1.EnvVar {
var sdkKey string
_ = ctx.WithExperimental(func(cfg *experimental.Config) error {
if cfg.WebApp != nil && cfg.WebApp.ConfigcatKey != "" {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's no WebApp config out of meta cluster

sdkKey = cfg.WebApp.ConfigcatKey
}
return nil
})

if sdkKey == "" {
return nil
}

return []corev1.EnvVar{
{
Name: "CONFIGCAT_SDK_KEY",
Expand Down
Loading