Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
水淹萌龙
kubesphere
提交
28af6787
K
kubesphere
项目概览
水淹萌龙
/
kubesphere
与 Fork 源项目一致
Fork自
KubeSphere / kubesphere
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
kubesphere
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
提交
28af6787
编写于
9月 26, 2019
作者:
J
Jeff
提交者:
zryfish
9月 26, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix apigateway clientset bug
上级
fe0108d2
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
57 addition
and
6 deletion
+57
-6
cmd/hypersphere/hypersphere.go
cmd/hypersphere/hypersphere.go
+3
-0
cmd/ks-apigateway/apiserver.go
cmd/ks-apigateway/apiserver.go
+8
-6
cmd/ks-apigateway/app/server.go
cmd/ks-apigateway/app/server.go
+46
-0
未找到文件。
cmd/hypersphere/hypersphere.go
浏览文件 @
28af6787
...
...
@@ -8,6 +8,7 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/pflag"
controllermanager
"kubesphere.io/kubesphere/cmd/controller-manager/app"
ksapigateway
"kubesphere.io/kubesphere/cmd/ks-apigateway/app"
ksapiserver
"kubesphere.io/kubesphere/cmd/ks-apiserver/app"
ksaiam
"kubesphere.io/kubesphere/cmd/ks-iam/app"
"os"
...
...
@@ -46,11 +47,13 @@ func NewHyperSphereCommand() (*cobra.Command, []func() *cobra.Command) {
apiserver
:=
func
()
*
cobra
.
Command
{
return
ksapiserver
.
NewAPIServerCommand
()
}
controllermanager
:=
func
()
*
cobra
.
Command
{
return
controllermanager
.
NewControllerManagerCommand
()
}
iam
:=
func
()
*
cobra
.
Command
{
return
ksaiam
.
NewAPIServerCommand
()
}
apigateway
:=
func
()
*
cobra
.
Command
{
return
ksapigateway
.
NewAPIGatewayCommand
()
}
commandFns
:=
[]
func
()
*
cobra
.
Command
{
apiserver
,
controllermanager
,
iam
,
apigateway
,
}
cmd
:=
&
cobra
.
Command
{
...
...
cmd/ks-apigateway/apiserver.go
浏览文件 @
28af6787
...
...
@@ -18,8 +18,8 @@
package
main
import
(
"
github.com/mholt/caddy/caddy/caddymain
"
"
github.com/mholt/caddy/caddyhttp/httpserver
"
"
kubesphere.io/kubesphere/cmd/ks-apigateway/app
"
"
os
"
// Install apis
_
"kubesphere.io/kubesphere/pkg/apigateway/caddy-plugin/authenticate"
...
...
@@ -28,8 +28,10 @@ import (
)
func
main
()
{
httpserver
.
RegisterDevDirective
(
"authenticate"
,
"jwt"
)
httpserver
.
RegisterDevDirective
(
"authentication"
,
"jwt"
)
httpserver
.
RegisterDevDirective
(
"swagger"
,
"jwt"
)
caddymain
.
Run
()
cmd
:=
app
.
NewAPIGatewayCommand
()
if
err
:=
cmd
.
Execute
();
err
!=
nil
{
os
.
Exit
(
1
)
}
}
cmd/ks-apigateway/app/server.go
0 → 100644
浏览文件 @
28af6787
package
app
import
(
"github.com/mholt/caddy/caddy/caddymain"
"github.com/mholt/caddy/caddyhttp/httpserver"
"github.com/spf13/cobra"
apiserverconfig
"kubesphere.io/kubesphere/pkg/server/config"
"kubesphere.io/kubesphere/pkg/simple/client"
"kubesphere.io/kubesphere/pkg/utils/signals"
)
func
NewAPIGatewayCommand
()
*
cobra
.
Command
{
cmd
:=
&
cobra
.
Command
{
Use
:
"ks-apigateway"
,
Long
:
`The KubeSphere API Gateway, which is responsible
for proxy request to the right backend. API Gateway also proxy
Kubernetes API Server for KubeSphere authorization purpose.
`
,
RunE
:
func
(
cmd
*
cobra
.
Command
,
args
[]
string
)
error
{
err
:=
apiserverconfig
.
Load
()
if
err
!=
nil
{
return
err
}
return
Run
(
signals
.
SetupSignalHandler
())
},
}
return
cmd
}
func
Run
(
stopCh
<-
chan
struct
{})
error
{
csop
:=
&
client
.
ClientSetOptions
{}
csop
.
SetKubernetesOptions
(
apiserverconfig
.
Get
()
.
KubernetesOptions
)
client
.
NewClientSetFactory
(
csop
,
stopCh
)
httpserver
.
RegisterDevDirective
(
"authenticate"
,
"jwt"
)
httpserver
.
RegisterDevDirective
(
"authentication"
,
"jwt"
)
httpserver
.
RegisterDevDirective
(
"swagger"
,
"jwt"
)
caddymain
.
Run
()
return
nil
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录