Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
水淹萌龙
kubesphere
提交
dcd341e7
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看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
dcd341e7
编写于
5月 12, 2020
作者:
Z
zryfish
提交者:
GitHub
5月 12, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix websocket bug (#2058)
上级
f34a4e1c
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
28 addition
and
3 deletion
+28
-3
pkg/apiserver/filters/kubeapiserver.go
pkg/apiserver/filters/kubeapiserver.go
+27
-2
pkg/models/tenant/tenent_test.go
pkg/models/tenant/tenent_test.go
+1
-1
未找到文件。
pkg/apiserver/filters/kubeapiserver.go
浏览文件 @
dcd341e7
package
filters
import
(
"k8s.io/apimachinery/pkg/util/net"
"k8s.io/apimachinery/pkg/util/proxy"
"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
"k8s.io/client-go/rest"
...
...
@@ -20,6 +21,16 @@ func WithKubeAPIServer(handler http.Handler, config *rest.Config, failed proxy.E
return
handler
}
tlsConfig
,
err
:=
net
.
TLSClientConfig
(
defaultTransport
)
if
err
!=
nil
{
klog
.
V
(
5
)
.
Infof
(
"Unable to unwrap transport %T to get at TLS config: %v"
,
defaultTransport
,
err
)
}
// since http2 doesn't support websocket, we need to disable http2 when using websocket
if
supportsHTTP11
(
tlsConfig
.
NextProtos
)
{
tlsConfig
.
NextProtos
=
[]
string
{
"http/1.1"
}
}
return
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
req
*
http
.
Request
)
{
info
,
ok
:=
request
.
RequestInfoFrom
(
req
.
Context
())
if
!
ok
{
...
...
@@ -33,10 +44,9 @@ func WithKubeAPIServer(handler http.Handler, config *rest.Config, failed proxy.E
s
.
Host
=
kubernetes
.
Host
s
.
Scheme
=
kubernetes
.
Scheme
//
Do not cover k8s client authorization header
//
make sure we don't override kubernetes's authorization
req
.
Header
.
Del
(
"Authorization"
)
httpProxy
:=
proxy
.
NewUpgradeAwareHandler
(
&
s
,
defaultTransport
,
true
,
false
,
failed
)
httpProxy
.
UpgradeTransport
=
proxy
.
NewUpgradeRequestRoundTripper
(
defaultTransport
,
defaultTransport
)
httpProxy
.
ServeHTTP
(
w
,
req
)
return
}
...
...
@@ -44,3 +54,18 @@ func WithKubeAPIServer(handler http.Handler, config *rest.Config, failed proxy.E
handler
.
ServeHTTP
(
w
,
req
)
})
}
// copy from https://github.com/kubernetes/apimachinery/blob/master/pkg/util/proxy/dial.go
func
supportsHTTP11
(
nextProtos
[]
string
)
bool
{
if
len
(
nextProtos
)
==
0
{
return
true
}
for
_
,
proto
:=
range
nextProtos
{
if
proto
==
"http/1.1"
{
return
true
}
}
return
false
}
pkg/models/tenant/tenent_test.go
浏览文件 @
dcd341e7
...
...
@@ -290,7 +290,7 @@ func prepare() Interface {
k8sClient
:=
fakek8s
.
NewSimpleClientset
()
istioClient
:=
fakeistio
.
NewSimpleClientset
()
appClient
:=
fakeapp
.
NewSimpleClientset
()
fakeInformerFactory
:=
informers
.
NewInformerFactories
(
k8sClient
,
ksClient
,
istioClient
,
appClient
)
fakeInformerFactory
:=
informers
.
NewInformerFactories
(
k8sClient
,
ksClient
,
istioClient
,
appClient
,
nil
,
nil
)
for
_
,
workspace
:=
range
workspaces
{
fakeInformerFactory
.
KubeSphereSharedInformerFactory
()
.
Tenant
()
.
V1alpha1
()
.
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录