From 581d997379ca7024a97904663db70d6d7de640dd Mon Sep 17 00:00:00 2001 From: dongjiang Date: Wed, 12 Mar 2025 18:04:33 +0800 Subject: [PATCH 1/2] fix panic Signed-off-by: dongjiang --- cmd/descheduler/app/options/options.go | 6 ++++-- cmd/descheduler/app/server.go | 18 ++++++++++++------ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/cmd/descheduler/app/options/options.go b/cmd/descheduler/app/options/options.go index 3d84c3158..f5a24b512 100644 --- a/cmd/descheduler/app/options/options.go +++ b/cmd/descheduler/app/options/options.go @@ -142,8 +142,10 @@ func (rs *DeschedulerServer) Apply() error { return err } - secureServing.DisableHTTP2 = !rs.EnableHTTP2 - rs.SecureServingInfo = secureServing + if secureServing != nil { + secureServing.DisableHTTP2 = !rs.EnableHTTP2 + rs.SecureServingInfo = secureServing + } return nil } diff --git a/cmd/descheduler/app/server.go b/cmd/descheduler/app/server.go index 8b18d2f11..7ecaf04e2 100644 --- a/cmd/descheduler/app/server.go +++ b/cmd/descheduler/app/server.go @@ -97,10 +97,14 @@ func Run(rootCtx context.Context, rs *options.DeschedulerServer) error { healthz.InstallHandler(pathRecorderMux, healthz.NamedCheck("Descheduler", healthz.PingHealthz.Check)) - stoppedCh, _, err := rs.SecureServingInfo.Serve(pathRecorderMux, 0, ctx.Done()) - if err != nil { - klog.Fatalf("failed to start secure server: %v", err) - return err + var stoppedCh <-chan struct{} + var err error + if rs.SecureServingInfo != nil { + stoppedCh, _, err = rs.SecureServingInfo.Serve(pathRecorderMux, 0, ctx.Done()) + if err != nil { + klog.Fatalf("failed to start secure server: %v", err) + return err + } } err = tracing.NewTracerProvider(ctx, rs.Tracing.CollectorEndpoint, rs.Tracing.TransportCert, rs.Tracing.ServiceName, rs.Tracing.ServiceNamespace, rs.Tracing.SampleRate, rs.Tracing.FallbackToNoOpProviderOnError) @@ -118,8 +122,10 @@ func Run(rootCtx context.Context, rs *options.DeschedulerServer) error { } done() - // wait for metrics server to close - <-stoppedCh + if stoppedCh != nil { + // wait for metrics server to close + <-stoppedCh + } return nil } From 5d4dc6604a44c2abd20f76cfefa91c999a894956 Mon Sep 17 00:00:00 2001 From: dongjiang Date: Wed, 30 Apr 2025 21:51:12 +0800 Subject: [PATCH 2/2] Update run-e2e-tests.sh --- test/run-e2e-tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/run-e2e-tests.sh b/test/run-e2e-tests.sh index 161b2e865..93325d3e6 100755 --- a/test/run-e2e-tests.sh +++ b/test/run-e2e-tests.sh @@ -43,7 +43,7 @@ if [ -n "$KIND_E2E" ]; then curl -Lo kubectl https://dl.k8s.io/release/${K8S_VERSION}/bin/linux/amd64/kubectl && chmod +x kubectl && mv kubectl /usr/local/bin/ fi if [ -z "${SKIP_KIND_INSTALL}" ]; then - wget https://github.com/kubernetes-sigs/kind/releases/download/v0.26.0/kind-linux-amd64 + wget https://github.com/kubernetes-sigs/kind/releases/download/v0.27.0/kind-linux-amd64 chmod +x kind-linux-amd64 mv kind-linux-amd64 kind export PATH=$PATH:$PWD