From 1055df5fcedce7e63d32aa4063305a4aa68603a8 Mon Sep 17 00:00:00 2001 From: Zhengyi Lai Date: Fri, 12 Jun 2020 15:12:38 +0800 Subject: [PATCH 1/2] Add option to enable network policy or not --- pkg/simple/client/network/options.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkg/simple/client/network/options.go b/pkg/simple/client/network/options.go index 3bc42e1d6..0323e6dba 100644 --- a/pkg/simple/client/network/options.go +++ b/pkg/simple/client/network/options.go @@ -6,12 +6,15 @@ 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", + WeaveScopeHost: "weave-scope-app.weave.svc", + EnableNetworkPolicy: false, } } @@ -24,9 +27,11 @@ 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.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.") } From e1e2b6b5e4066e52f848baf5cb5efc6b8e0ab13d Mon Sep 17 00:00:00 2001 From: Zhengyi Lai Date: Fri, 12 Jun 2020 15:23:00 +0800 Subject: [PATCH 2/2] Remove WeaveScopeHost from network Signed-off-by: Zhengyi Lai --- pkg/apiserver/apiserver.go | 2 -- pkg/apiserver/config/config.go | 2 +- pkg/apiserver/config/config_test.go | 2 +- pkg/simple/client/network/options.go | 9 --------- 4 files changed, 2 insertions(+), 13 deletions(-) diff --git a/pkg/apiserver/apiserver.go b/pkg/apiserver/apiserver.go index c569c769b..6e2a9c66a 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 2425e24bb..201e6b405 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 566f90d52..88a47e585 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 0323e6dba..10d0e9717 100644 --- a/pkg/simple/client/network/options.go +++ b/pkg/simple/client/network/options.go @@ -3,17 +3,12 @@ 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, } } @@ -24,14 +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.") }