From 56918c5e5085830f6446f21d8db079f4ac218a5c Mon Sep 17 00:00:00 2001 From: Mary Freitas Date: Thu, 30 Oct 2025 15:15:18 -0300 Subject: [PATCH] backport and bump dynamiclistener v0.6.4-rc.2 --- go.mod | 2 +- go.sum | 4 ++-- pkg/server/server.go | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 78634cdf4..5a2c160ee 100644 --- a/go.mod +++ b/go.mod @@ -44,7 +44,7 @@ require ( github.com/evanphx/json-patch v5.9.11+incompatible github.com/go-ldap/ldap/v3 v3.4.10 github.com/gorilla/mux v1.8.1 - github.com/rancher/dynamiclistener v0.6.2 + github.com/rancher/dynamiclistener v0.6.4-rc.2 github.com/rancher/lasso v0.2.4 github.com/rancher/rancher/pkg/apis v0.0.0-20250919133431-8e6245f06426 github.com/rancher/rke v1.8.5 diff --git a/go.sum b/go.sum index ad7c7601b..2ea263316 100644 --- a/go.sum +++ b/go.sum @@ -173,8 +173,8 @@ github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0leargg github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rancher/aks-operator v1.11.6 h1:8MS9FupLEdRa2Edfe7nsk/yGyKr9ETPRrsioE8mmUGI= github.com/rancher/aks-operator v1.11.6/go.mod h1:IfhwFivRMaREoGJjO0J6/337iN7Ek4gITuFQeBFx1p0= -github.com/rancher/dynamiclistener v0.6.2 h1:F0SEJhvO2aFe0eTvKGlQoy5x7HtwK8oJbyITVfBSb90= -github.com/rancher/dynamiclistener v0.6.2/go.mod h1:ncmVR7qR8kR1o6xNkTcVS2mZ9WtlljimBilIlNjdyzc= +github.com/rancher/dynamiclistener v0.6.4-rc.2 h1:2ko4gSmSTXnn8Yk8cJWcEGUoYYA0ESR5WmfbfBD/EmI= +github.com/rancher/dynamiclistener v0.6.4-rc.2/go.mod h1:MqdVm4tlq7jPyd0+PrdVxSROPpvRnlaat65rqtXjCak= github.com/rancher/eks-operator v1.11.6 h1:ilGH/H6+YXktg0yHRlAba7rUFn9zN9cGxRNx00ZskDY= github.com/rancher/eks-operator v1.11.6/go.mod h1:n+NAS/0MzYHvhoQFLjM9znz4Qa6lU+qSJ71Erw8hb80= github.com/rancher/fleet/pkg/apis v0.12.3 h1:GMO3V0AK+V5BmuTMH7EPrL3QcrgFWUItEQCqPj1zNZQ= diff --git a/pkg/server/server.go b/pkg/server/server.go index 2049050fd..ea37531f2 100644 --- a/pkg/server/server.go +++ b/pkg/server/server.go @@ -151,6 +151,7 @@ func listenAndServe(ctx context.Context, clients *clients.Clients, validators [] return fmt.Errorf("failed to decode webhook port value '%s': %w", portStr, err) } } + return server.ListenAndServe(ctx, webhookHTTPSPort, webhookHTTPPort, router, &server.ListenOpts{ Secrets: clients.Core.Secret(), CertNamespace: namespace, @@ -163,7 +164,8 @@ func listenAndServe(ctx context.Context, clients *clients.Clients, validators [] FilterCN: dynamiclistener.OnlyAllow(tlsName), TLSConfig: tlsConfig, }, - DisplayServerLogs: true, + DisplayServerLogs: true, + IgnoreTLSHandshakeError: true, }) }