Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
凌波微步_大先生
dashboard
提交
c461975c
D
dashboard
项目概览
凌波微步_大先生
/
dashboard
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dashboard
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
c461975c
编写于
3月 12, 2020
作者:
S
Sebastian Florek
提交者:
GitHub
3月 12, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix create form (#5002)
上级
fda7fcf0
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
20 addition
and
9 deletion
+20
-9
src/app/backend/client/manager.go
src/app/backend/client/manager.go
+9
-4
src/app/backend/resource/deployment/deploy.go
src/app/backend/resource/deployment/deploy.go
+11
-5
未找到文件。
src/app/backend/client/manager.go
浏览文件 @
c461975c
...
...
@@ -264,10 +264,15 @@ func (self *clientManager) VerberClient(req *restful.Request, config *rest.Confi
return
nil
,
err
}
return
NewResourceVerber
(
k8sClient
.
CoreV1
()
.
RESTClient
(),
k8sClient
.
ExtensionsV1beta1
()
.
RESTClient
(),
k8sClient
.
AppsV1
()
.
RESTClient
(),
k8sClient
.
BatchV1
()
.
RESTClient
(),
k8sClient
.
BatchV1beta1
()
.
RESTClient
(),
k8sClient
.
AutoscalingV1
()
.
RESTClient
(),
k8sClient
.
StorageV1
()
.
RESTClient
(),
k8sClient
.
RbacV1
()
.
RESTClient
(),
return
NewResourceVerber
(
k8sClient
.
CoreV1
()
.
RESTClient
(),
k8sClient
.
ExtensionsV1beta1
()
.
RESTClient
(),
k8sClient
.
AppsV1
()
.
RESTClient
(),
k8sClient
.
BatchV1
()
.
RESTClient
(),
k8sClient
.
BatchV1beta1
()
.
RESTClient
(),
k8sClient
.
AutoscalingV1
()
.
RESTClient
(),
k8sClient
.
StorageV1
()
.
RESTClient
(),
k8sClient
.
RbacV1
()
.
RESTClient
(),
apiextensionsRestClient
,
pluginsclient
.
DashboardV1alpha1
()
.
RESTClient
(),
config
),
nil
...
...
src/app/backend/resource/deployment/deploy.go
浏览文件 @
c461975c
...
...
@@ -20,7 +20,6 @@ import (
"log"
"strings"
"github.com/kubernetes/dashboard/src/app/backend/errors"
apps
"k8s.io/api/apps/v1"
api
"k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
...
...
@@ -34,6 +33,8 @@ import (
"k8s.io/client-go/dynamic"
client
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"
"github.com/kubernetes/dashboard/src/app/backend/errors"
)
const
(
...
...
@@ -304,8 +305,8 @@ func DeployAppFromFile(cfg *rest.Config, spec *AppDeploymentFromFileSpec) (bool,
log
.
Printf
(
"Namespace for deploy from file: %s
\n
"
,
spec
.
Namespace
)
d
:=
yaml
.
NewYAMLOrJSONDecoder
(
reader
,
4096
)
for
{
data
:=
unstructured
.
Unstructured
{}
if
err
:=
d
.
Decode
(
&
data
);
err
!=
nil
{
data
:=
&
unstructured
.
Unstructured
{}
if
err
:=
d
.
Decode
(
data
);
err
!=
nil
{
if
err
==
io
.
EOF
{
return
true
,
nil
}
...
...
@@ -347,11 +348,16 @@ func DeployAppFromFile(cfg *rest.Config, spec *AppDeploymentFromFileSpec) (bool,
}
groupVersionResource
:=
schema
.
GroupVersionResource
{
Group
:
gv
.
Group
,
Version
:
gv
.
Version
,
Resource
:
resource
.
Name
}
namespace
:=
spec
.
Namespace
if
strings
.
Compare
(
spec
.
Namespace
,
"_all"
)
==
0
{
_
,
err
=
dynamicClient
.
Resource
(
groupVersionResource
)
.
Namespace
(
data
.
GetNamespace
())
.
Create
(
&
data
,
metaV1
.
CreateOptions
{})
namespace
=
data
.
GetNamespace
()
}
if
resource
.
Namespaced
{
_
,
err
=
dynamicClient
.
Resource
(
groupVersionResource
)
.
Namespace
(
namespace
)
.
Create
(
data
,
metaV1
.
CreateOptions
{})
}
else
{
_
,
err
=
dynamicClient
.
Resource
(
groupVersionResource
)
.
Namespace
(
spec
.
Namespace
)
.
Create
(
&
data
,
metaV1
.
CreateOptions
{})
_
,
err
=
dynamicClient
.
Resource
(
groupVersionResource
)
.
Create
(
data
,
metaV1
.
CreateOptions
{})
}
if
err
!=
nil
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录