From 27b335a9c9e2da7fd0c08e0feabc4d6cc83c6fe8 Mon Sep 17 00:00:00 2001 From: Duan Jiong Date: Fri, 25 Dec 2020 12:29:53 +0800 Subject: [PATCH] Support ippool configuration status field Signed-off-by: Duan Jiong --- pkg/apiserver/config/config.go | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/pkg/apiserver/config/config.go b/pkg/apiserver/config/config.go index 201e6b405..7255a3c8b 100644 --- a/pkg/apiserver/config/config.go +++ b/pkg/apiserver/config/config.go @@ -19,6 +19,7 @@ package config import ( "fmt" "github.com/spf13/viper" + networkv1alpha1 "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" authoptions "kubesphere.io/kubesphere/pkg/apiserver/authentication/options" authorizationoptions "kubesphere.io/kubesphere/pkg/apiserver/authorization/options" "kubesphere.io/kubesphere/pkg/simple/client/alerting" @@ -166,6 +167,28 @@ func (conf *Config) ToMap() map[string]bool { continue } + if name == "network" { + ippoolName := "network.ippool" + nsnpName := "network" + if conf.NetworkOptions == nil { + result[nsnpName] = false + result[ippoolName] = false + } else { + if conf.NetworkOptions.EnableNetworkPolicy { + result[nsnpName] = true + } else { + result[nsnpName] = false + } + + if conf.NetworkOptions.IPPoolType == networkv1alpha1.IPPoolTypeNone { + result[ippoolName] = false + } else { + result[ippoolName] = true + } + } + continue + } + if c.Field(i).IsNil() { result[name] = false } else {