implement identity provider and built-in oauth server

Signed-off-by: hongming <talonwan@yunify.com>

cmd/controller-manager/app/options/options.go

@@ -9,7 +9,6 @@ import (
 	kubesphereconfig "kubesphere.io/kubesphere/pkg/apiserver/config"
 	"kubesphere.io/kubesphere/pkg/simple/client/devops/jenkins"
 	"kubesphere.io/kubesphere/pkg/simple/client/k8s"
-	"kubesphere.io/kubesphere/pkg/simple/client/kubesphere"
 	"kubesphere.io/kubesphere/pkg/simple/client/openpitrix"
 	"kubesphere.io/kubesphere/pkg/simple/client/s3"
 	"strings"
@@ -21,9 +20,7 @@ type KubeSphereControllerManagerOptions struct {
 	DevopsOptions     *jenkins.Options
 	S3Options         *s3.Options
 	OpenPitrixOptions *openpitrix.Options
-	KubeSphereOptions *kubesphere.Options
-
-	LeaderElection *leaderelection.LeaderElectionConfig
+	LeaderElection    *leaderelection.LeaderElectionConfig
 }
 
 func NewKubeSphereControllerManagerOptions() *KubeSphereControllerManagerOptions {
@@ -32,7 +29,6 @@ func NewKubeSphereControllerManagerOptions() *KubeSphereControllerManagerOptions
 		DevopsOptions:     jenkins.NewDevopsOptions(),
 		S3Options:         s3.NewS3Options(),
 		OpenPitrixOptions: openpitrix.NewOptions(),
-		KubeSphereOptions: kubesphere.NewKubeSphereOptions(),
 		LeaderElection: &leaderelection.LeaderElectionConfig{
 			LeaseDuration: 30 * time.Second,
 			RenewDeadline: 15 * time.Second,

cmd/controller-manager/app/server.go

@@ -38,7 +38,6 @@ import (
 	"kubesphere.io/kubesphere/pkg/controller/workspace"
 	"kubesphere.io/kubesphere/pkg/informers"
 	"kubesphere.io/kubesphere/pkg/simple/client/k8s"
-	kclient "kubesphere.io/kubesphere/pkg/simple/client/kubesphere"
 	"kubesphere.io/kubesphere/pkg/simple/client/openpitrix"
 	"kubesphere.io/kubesphere/pkg/utils/term"
 	"os"
@@ -96,8 +95,6 @@ func Run(s *options.KubeSphereControllerManagerOptions, stopCh <-chan struct{})
 		return err
 	}
 
-	kubesphereClient := kclient.NewKubeSphereClient(s.KubeSphereOptions)
-
 	openpitrixClient, err := openpitrix.NewClient(s.OpenPitrixOptions)
 	if err != nil {
 		klog.Errorf("Failed to create openpitrix client %v", err)
@@ -136,7 +133,7 @@ func Run(s *options.KubeSphereControllerManagerOptions, stopCh <-chan struct{})
 		}
 
 		klog.V(0).Info("Setting up controllers")
-		err = workspace.Add(mgr, kubesphereClient)
+		err = workspace.Add(mgr)
 		if err != nil {
 			klog.Fatal("Unable to create workspace controller")
 		}

cmd/ks-apiserver/app/options/options.go

@@ -6,8 +6,9 @@ import (
 	"fmt"
 	cliflag "k8s.io/component-base/cli/flag"
 	"k8s.io/klog"
-	"kubesphere.io/kubesphere/pkg/api/auth"
 	"kubesphere.io/kubesphere/pkg/apiserver"
+	authoptions "kubesphere.io/kubesphere/pkg/apiserver/authentication/options"
+	apiserverconfig "kubesphere.io/kubesphere/pkg/apiserver/config"
 	"kubesphere.io/kubesphere/pkg/informers"
 	genericoptions "kubesphere.io/kubesphere/pkg/server/options"
 	"kubesphere.io/kubesphere/pkg/simple/client/cache"
@@ -29,42 +30,32 @@ import (
 type ServerRunOptions struct {
 	ConfigFile              string
 	GenericServerRunOptions *genericoptions.ServerRunOptions
-	KubernetesOptions       *k8s.KubernetesOptions
-	DevopsOptions           *jenkins.Options
-	SonarQubeOptions        *sonarqube.Options
-	ServiceMeshOptions      *servicemesh.Options
-	MySQLOptions            *mysql.Options
-	MonitoringOptions       *prometheus.Options
-	S3Options               *s3.Options
-	OpenPitrixOptions       *openpitrix.Options
-	LoggingOptions          *esclient.Options
-	LdapOptions             *ldap.Options
-	CacheOptions            *cache.Options
-	AuthenticateOptions     *auth.AuthenticationOptions
+	*apiserverconfig.Config
 
 	//
 	DebugMode bool
 }
 
 func NewServerRunOptions() *ServerRunOptions {
-
-	s := ServerRunOptions{
+	s := &ServerRunOptions{
 		GenericServerRunOptions: genericoptions.NewServerRunOptions(),
-		KubernetesOptions:       k8s.NewKubernetesOptions(),
-		DevopsOptions:           jenkins.NewDevopsOptions(),
-		SonarQubeOptions:        sonarqube.NewSonarQubeOptions(),
-		ServiceMeshOptions:      servicemesh.NewServiceMeshOptions(),
-		MySQLOptions:            mysql.NewMySQLOptions(),
-		MonitoringOptions:       prometheus.NewPrometheusOptions(),
-		S3Options:               s3.NewS3Options(),
-		OpenPitrixOptions:       openpitrix.NewOptions(),
-		LoggingOptions:          esclient.NewElasticSearchOptions(),
-		LdapOptions:             ldap.NewOptions(),
-		CacheOptions:            cache.NewRedisOptions(),
-		AuthenticateOptions:     auth.NewAuthenticateOptions(),
+		Config: &apiserverconfig.Config{
+			KubernetesOptions:     k8s.NewKubernetesOptions(),
+			DevopsOptions:         jenkins.NewDevopsOptions(),
+			SonarQubeOptions:      sonarqube.NewSonarQubeOptions(),
+			ServiceMeshOptions:    servicemesh.NewServiceMeshOptions(),
+			MySQLOptions:          mysql.NewMySQLOptions(),
+			MonitoringOptions:     prometheus.NewPrometheusOptions(),
+			S3Options:             s3.NewS3Options(),
+			OpenPitrixOptions:     openpitrix.NewOptions(),
+			LoggingOptions:        esclient.NewElasticSearchOptions(),
+			LdapOptions:           ldap.NewOptions(),
+			RedisOptions:          cache.NewRedisOptions(),
+			AuthenticationOptions: authoptions.NewAuthenticateOptions(),
+		},
 	}
 
-	return &s
+	return s
 }
 
 func (s *ServerRunOptions) Flags() (fss cliflag.NamedFlagSets) {
@@ -72,12 +63,12 @@ func (s *ServerRunOptions) Flags() (fss cliflag.NamedFlagSets) {
 	fs.BoolVar(&s.DebugMode, "debug", false, "Don't enable this if you don't know what it means.")
 	s.GenericServerRunOptions.AddFlags(fs, s.GenericServerRunOptions)
 	s.KubernetesOptions.AddFlags(fss.FlagSet("kubernetes"), s.KubernetesOptions)
-	s.AuthenticateOptions.AddFlags(fss.FlagSet("authenticate"), s.AuthenticateOptions)
+	s.AuthenticationOptions.AddFlags(fss.FlagSet("authentication"), s.AuthenticationOptions)
 	s.MySQLOptions.AddFlags(fss.FlagSet("mysql"), s.MySQLOptions)
 	s.DevopsOptions.AddFlags(fss.FlagSet("devops"), s.DevopsOptions)
 	s.SonarQubeOptions.AddFlags(fss.FlagSet("sonarqube"), s.SonarQubeOptions)
 	s.LdapOptions.AddFlags(fss.FlagSet("ldap"), s.LdapOptions)
-	s.CacheOptions.AddFlags(fss.FlagSet("cache"), s.CacheOptions)
+	s.RedisOptions.AddFlags(fss.FlagSet("redis"), s.RedisOptions)
 	s.S3Options.AddFlags(fss.FlagSet("s3"), s.S3Options)
 	s.OpenPitrixOptions.AddFlags(fss.FlagSet("openpitrix"), s.OpenPitrixOptions)
 	s.ServiceMeshOptions.AddFlags(fss.FlagSet("servicemesh"), s.ServiceMeshOptions)
@@ -100,7 +91,7 @@ const fakeInterface string = "FAKE"
 // NewAPIServer creates an APIServer instance using given options
 func (s *ServerRunOptions) NewAPIServer(stopCh <-chan struct{}) (*apiserver.APIServer, error) {
 	apiServer := &apiserver.APIServer{
-		AuthenticateOptions: s.AuthenticateOptions,
+		Config: s.Config,
 	}
 
 	kubernetesClient, err := k8s.NewKubernetesClient(s.KubernetesOptions)
@@ -156,11 +147,11 @@ func (s *ServerRunOptions) NewAPIServer(stopCh <-chan struct{}) (*apiserver.APIS
 	}
 
 	var cacheClient cache.Interface
-	if s.CacheOptions.Host != "" {
-		if s.CacheOptions.Host == fakeInterface && s.DebugMode {
+	if s.RedisOptions.Host != "" {
+		if s.RedisOptions.Host == fakeInterface && s.DebugMode {
 			apiServer.CacheClient = cache.NewSimpleCache()
 		} else {
-			cacheClient, err = cache.NewRedisClient(s.CacheOptions, stopCh)
+			cacheClient, err = cache.NewRedisClient(s.RedisOptions, stopCh)
 			if err != nil {
 				return nil, err
 			}

cmd/ks-apiserver/app/server.go

@@ -37,18 +37,7 @@ func NewAPIServerCommand() *cobra.Command {
 	if err == nil {
 		s = &options.ServerRunOptions{
 			GenericServerRunOptions: s.GenericServerRunOptions,
-			KubernetesOptions:       conf.KubernetesOptions,
-			DevopsOptions:           conf.DevopsOptions,
-			SonarQubeOptions:        conf.SonarQubeOptions,
-			ServiceMeshOptions:      conf.ServiceMeshOptions,
-			MySQLOptions:            conf.MySQLOptions,
-			MonitoringOptions:       conf.MonitoringOptions,
-			S3Options:               conf.S3Options,
-			OpenPitrixOptions:       conf.OpenPitrixOptions,
-			LoggingOptions:          conf.LoggingOptions,
-			LdapOptions:             conf.LdapOptions,
-			CacheOptions:            conf.RedisOptions,
-			AuthenticateOptions:     conf.AuthenticateOptions,
+			Config:                  conf,
 		}
 	}