Skip to content

K
k3s
Commit 4349cb31 authored by Brad Davidson's avatar Brad Davidson Committed by Brad Davidson
Browse files
Options

Skip netpol startup on windows instead of panicing

Netpol startup is skipped with a warning on linux if ipset support is missing, we should do the same on windows Signed-off-by: 's avatarBrad Davidson <brad.davidson@rancher.com> (cherry picked from commit 96c2dd38) Signed-off-by: 's avatarBrad Davidson <brad.davidson@rancher.com>
parent e1894998
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
pkg/agent/netpol/netpol_windows.go
View file @ 4349cb31
...@@ -4,8 +4,10 @@ import ( ...@@ -4,8 +4,10 @@ import (
"context" "context"
daemonconfig "github.com/k3s-io/k3s/pkg/daemons/config" daemonconfig "github.com/k3s-io/k3s/pkg/daemons/config"
"github.com/sirupsen/logrus"
) )
func Run(ctx context.Context, nodeConfig *daemonconfig.Node) error { func Run(ctx context.Context, nodeConfig *daemonconfig.Node) error {
panic("Netpol is not supported on windows ensure to pass --disable-network-policy") logrus.Warnf("Skipping network policy controller start, netpol is not supported on windows")
return nil
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment