Skip to content

Make applyClusterTLSProfile() non-fatal to prevent crash-loops in HyperShift hosted clusters #3859

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

Closed
redhat-chai-bot wants to merge 1 commit into from
Closed

Make applyClusterTLSProfile() non-fatal to prevent crash-loops in HyperShift hosted clusters #3859

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
5 changes: 3 additions & 2 deletions pkg/package-server/server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,8 @@ func (o *PackageServerOptions) Run(ctx context.Context) error {
// honours the cluster TLS security profile on first boot or during upgrades.
if o.SecureServing.MinTLSVersion == "" {
if err := applyClusterTLSProfile(ctx, clientConfig, o.SecureServing); err != nil {
return fmt.Errorf("failed to apply cluster TLS profile to serving options: %w", err)
log.WithError(err).Warn("Failed to apply cluster TLS profile to serving options, continuing with defaults. " +
"PSM will inject the correct TLS flags on next reconciliation.")
Comment on lines 229 to +231
}
}

Expand Down Expand Up @@ -348,7 +349,7 @@ func (op *Operator) syncOLMConfig(obj interface{}) error {
// This is the fallback path used when --tls-min-version is not provided via flags
// (i.e. before the PSM has had a chance to inject them).
func applyClusterTLSProfile(ctx context.Context, config *rest.Config, serving *genericoptions.SecureServingOptionsWithLoopback) error {
const lookupTimeout = 30 * time.Second
const lookupTimeout = 10 * time.Second
profileCtx, cancel := context.WithTimeout(ctx, lookupTimeout)
defer cancel()

Expand Down