Merge branch 'dev' into devops-refactor

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

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	cliflag "k8s.io/component-base/cli/flag"
 	"k8s.io/klog"
-	"kubesphere.io/kubesphere/pkg/api/iam"
+	"kubesphere.io/kubesphere/pkg/api/auth"
 	"kubesphere.io/kubesphere/pkg/apiserver"
 	"kubesphere.io/kubesphere/pkg/informers"
 	genericoptions "kubesphere.io/kubesphere/pkg/server/options"
@@ -40,7 +40,7 @@ type ServerRunOptions struct {
 	LoggingOptions          *esclient.Options
 	LdapOptions             *ldap.Options
 	CacheOptions            *cache.Options
-	AuthenticateOptions     *iam.AuthenticationOptions
+	AuthenticateOptions     *auth.AuthenticationOptions
 
 	//
 	DebugMode bool
@@ -61,7 +61,7 @@ func NewServerRunOptions() *ServerRunOptions {
 		LoggingOptions:          esclient.NewElasticSearchOptions(),
 		LdapOptions:             ldap.NewOptions(),
 		CacheOptions:            cache.NewRedisOptions(),
-		AuthenticateOptions:     iam.NewAuthenticateOptions(),
+		AuthenticateOptions:     auth.NewAuthenticateOptions(),
 	}
 
 	return &s

cmd/ks-apiserver/app/server.go

@@ -46,6 +46,8 @@ func NewAPIServerCommand() *cobra.Command {
 			S3Options:               conf.S3Options,
 			OpenPitrixOptions:       conf.OpenPitrixOptions,
 			LoggingOptions:          conf.LoggingOptions,
+			LdapOptions:             conf.LdapOptions,
+			CacheOptions:            conf.RedisOptions,
 			AuthenticateOptions:     conf.AuthenticateOptions,
 		}
 	}