Merge pull request #692 from magicsong/nsnp

✨support calico with k8s storage

pkg/controller/network/provider/calico_k8s.go

@@ -0,0 +1,3 @@
+package provider
+
+// +kubebuilder:rbac:groups="crd.projectcalico.org",resources=globalfelixconfigs;felixconfigurations;ippools;ipamblocks;globalnetworkpolicies;globalnetworksets;networkpolicies;networksets;clusterinformations;hostendpoints,verbs=get;list;watch;create;patch;update;delete

pkg/controller/network/runoption/option.go

@@ -14,18 +14,16 @@ import (
 	"kubesphere.io/kubesphere/pkg/controller/network/provider"
 )
 
-type CalicoDataStoreType string
-
 const (
 	certPath = "/calicocerts"
 
-	KubernetesDataStore CalicoDataStoreType = "k8s"
-	EtcdDataStore       CalicoDataStoreType = "etcd"
+	KubernetesDataStore = "k8s"
+	EtcdDataStore       = "etcd"
 )
 
 type RunOption struct {
 	ProviderName      string
-	DataStoreType     CalicoDataStoreType
+	DataStoreType     string
 	EtcdEndpoints     string
 	AllowInsecureEtcd bool
 }