diff --git a/pkg/apiserver/apiserver.go b/pkg/apiserver/apiserver.go index c569c769b91979c0f6896888c134c70a06593f5b..6e2a9c66a09c6bffe07eac38699f95129a9ff5c6 100644 --- a/pkg/apiserver/apiserver.go +++ b/pkg/apiserver/apiserver.go @@ -50,7 +50,6 @@ import ( devopsv1alpha3 "kubesphere.io/kubesphere/pkg/kapis/devops/v1alpha3" iamapi "kubesphere.io/kubesphere/pkg/kapis/iam/v1alpha2" monitoringv1alpha3 "kubesphere.io/kubesphere/pkg/kapis/monitoring/v1alpha3" - networkv1alpha2 "kubesphere.io/kubesphere/pkg/kapis/network/v1alpha2" notificationv1 "kubesphere.io/kubesphere/pkg/kapis/notification/v1" "kubesphere.io/kubesphere/pkg/kapis/oauth" openpitrixv1 "kubesphere.io/kubesphere/pkg/kapis/openpitrix/v1" @@ -170,7 +169,6 @@ func (s *APIServer) installKubeSphereAPIs() { urlruntime.Must(resourcev1alpha3.AddToContainer(s.container, s.InformerFactory)) urlruntime.Must(monitoringv1alpha3.AddToContainer(s.container, s.KubernetesClient.Kubernetes(), s.MonitoringClient, s.InformerFactory, s.OpenpitrixClient)) urlruntime.Must(openpitrixv1.AddToContainer(s.container, s.InformerFactory, s.OpenpitrixClient)) - urlruntime.Must(networkv1alpha2.AddToContainer(s.container, s.Config.NetworkOptions.WeaveScopeHost)) urlruntime.Must(operationsv1alpha2.AddToContainer(s.container, s.KubernetesClient.Kubernetes())) urlruntime.Must(resourcesv1alpha2.AddToContainer(s.container, s.KubernetesClient.Kubernetes(), s.InformerFactory, s.KubernetesClient.Master())) diff --git a/pkg/apiserver/config/config.go b/pkg/apiserver/config/config.go index 2425e24bb77d55a3a92561fc428d8ced444c9832..201e6b4057a6cf8ca2fe2834cbcdb58237bd45e5 100644 --- a/pkg/apiserver/config/config.go +++ b/pkg/apiserver/config/config.go @@ -203,7 +203,7 @@ func (conf *Config) stripEmptyOptions() { conf.OpenPitrixOptions = nil } - if conf.NetworkOptions != nil && conf.NetworkOptions.WeaveScopeHost == "" { + if conf.NetworkOptions != nil && conf.NetworkOptions.EnableNetworkPolicy == false { conf.NetworkOptions = nil } diff --git a/pkg/apiserver/config/config_test.go b/pkg/apiserver/config/config_test.go index 566f90d52826db4307329576945fc074f085cbdc..88a47e5858cfff2da1c99511c41ce189a76045c5 100644 --- a/pkg/apiserver/config/config_test.go +++ b/pkg/apiserver/config/config_test.go @@ -101,7 +101,7 @@ func newTestConfig() (*Config, error) { AttachmentManagerEndpoint: "openpitrix-hyperpitrix.openpitrix-system.svc:9122", }, NetworkOptions: &network.Options{ - WeaveScopeHost: "weave-scope-app.weave.svc", + EnableNetworkPolicy: true, }, MonitoringOptions: &prometheus.Options{ Endpoint: "http://prometheus.kubesphere-monitoring-system.svc", diff --git a/pkg/simple/client/network/options.go b/pkg/simple/client/network/options.go index 3bc42e1d6ccaec743aadb335b4f1f38ea6c17c3b..10d0e9717986b8856b2257d1352051f6e7d04299 100644 --- a/pkg/simple/client/network/options.go +++ b/pkg/simple/client/network/options.go @@ -3,15 +3,13 @@ package network import "github.com/spf13/pflag" type Options struct { - - // weave scope service host - WeaveScopeHost string `json:"weaveScopeHost,omitempty" yaml:"weaveScopeHost"` + EnableNetworkPolicy bool `json:"enableNetworkPolicy,omitempty" yaml:"enableNetworkPolicy"` } // NewNetworkOptions returns a `zero` instance func NewNetworkOptions() *Options { return &Options{ - WeaveScopeHost: "weave-scope-app.weave.svc", + EnableNetworkPolicy: false, } } @@ -21,12 +19,10 @@ func (s *Options) Validate() []error { } func (s *Options) ApplyTo(options *Options) { - if s.WeaveScopeHost != "" { - options.WeaveScopeHost = s.WeaveScopeHost - } + options.EnableNetworkPolicy = s.EnableNetworkPolicy } func (s *Options) AddFlags(fs *pflag.FlagSet, c *Options) { - fs.StringVar(&s.WeaveScopeHost, "weave-scope-host", c.WeaveScopeHost, ""+ - "weave scope service host") + fs.BoolVar(&s.EnableNetworkPolicy, "enable-network-policy", c.EnableNetworkPolicy, + "This field instructs KubeSphere to enable network policy or not.") }