Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
水淹萌龙
kubesphere
提交
d79104b8
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看板
提交
d79104b8
编写于
2月 24, 2021
作者:
W
wanjunlei
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
change api version to v2alpha1
Signed-off-by:
N
wanjunlei
<
wanjunlei@yunify.com
>
上级
5e39b7c7
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
6 addition
and
6 deletion
+6
-6
pkg/apiserver/apiserver.go
pkg/apiserver/apiserver.go
+2
-2
pkg/kapis/notification/v2alpha1/handler.go
pkg/kapis/notification/v2alpha1/handler.go
+2
-2
pkg/kapis/notification/v2alpha1/register.go
pkg/kapis/notification/v2alpha1/register.go
+2
-2
未找到文件。
pkg/apiserver/apiserver.go
浏览文件 @
d79104b8
...
@@ -69,7 +69,7 @@ import (
...
@@ -69,7 +69,7 @@ import (
monitoringv1alpha3
"kubesphere.io/kubesphere/pkg/kapis/monitoring/v1alpha3"
monitoringv1alpha3
"kubesphere.io/kubesphere/pkg/kapis/monitoring/v1alpha3"
networkv1alpha2
"kubesphere.io/kubesphere/pkg/kapis/network/v1alpha2"
networkv1alpha2
"kubesphere.io/kubesphere/pkg/kapis/network/v1alpha2"
notificationv1
"kubesphere.io/kubesphere/pkg/kapis/notification/v1"
notificationv1
"kubesphere.io/kubesphere/pkg/kapis/notification/v1"
notificationv2
"kubesphere.io/kubesphere/pkg/kapis/notification/v2
"
notificationv2
alpha1
"kubesphere.io/kubesphere/pkg/kapis/notification/v2alpha1
"
"kubesphere.io/kubesphere/pkg/kapis/oauth"
"kubesphere.io/kubesphere/pkg/kapis/oauth"
openpitrixv1
"kubesphere.io/kubesphere/pkg/kapis/openpitrix/v1"
openpitrixv1
"kubesphere.io/kubesphere/pkg/kapis/openpitrix/v1"
operationsv1alpha2
"kubesphere.io/kubesphere/pkg/kapis/operations/v1alpha2"
operationsv1alpha2
"kubesphere.io/kubesphere/pkg/kapis/operations/v1alpha2"
...
@@ -272,7 +272,7 @@ func (s *APIServer) installKubeSphereAPIs() {
...
@@ -272,7 +272,7 @@ func (s *APIServer) installKubeSphereAPIs() {
s
.
KubernetesClient
.
Prometheus
(),
s
.
AlertingClient
,
s
.
Config
.
AlertingOptions
))
s
.
KubernetesClient
.
Prometheus
(),
s
.
AlertingClient
,
s
.
Config
.
AlertingOptions
))
urlruntime
.
Must
(
version
.
AddToContainer
(
s
.
container
,
s
.
KubernetesClient
.
Discovery
()))
urlruntime
.
Must
(
version
.
AddToContainer
(
s
.
container
,
s
.
KubernetesClient
.
Discovery
()))
urlruntime
.
Must
(
kubeedgev1alpha1
.
AddToContainer
(
s
.
container
,
s
.
Config
.
KubeEdgeOptions
.
Endpoint
))
urlruntime
.
Must
(
kubeedgev1alpha1
.
AddToContainer
(
s
.
container
,
s
.
Config
.
KubeEdgeOptions
.
Endpoint
))
urlruntime
.
Must
(
notificationv2
.
AddToContainer
(
s
.
container
,
s
.
InformerFactory
,
s
.
KubernetesClient
.
Kubernetes
(),
urlruntime
.
Must
(
notificationv2
alpha1
.
AddToContainer
(
s
.
container
,
s
.
InformerFactory
,
s
.
KubernetesClient
.
Kubernetes
(),
s
.
KubernetesClient
.
KubeSphere
()))
s
.
KubernetesClient
.
KubeSphere
()))
}
}
...
...
pkg/kapis/notification/v2/handler.go
→
pkg/kapis/notification/v2
alpha1
/handler.go
浏览文件 @
d79104b8
...
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
...
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
limitations under the License.
*/
*/
package
v2
package
v2
alpha1
import
(
import
(
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful"
...
@@ -125,7 +125,7 @@ func (h *handler) DeleteResource(req *restful.Request, resp *restful.Response) {
...
@@ -125,7 +125,7 @@ func (h *handler) DeleteResource(req *restful.Request, resp *restful.Response) {
return
return
}
}
handleResponse
(
req
,
resp
,
h
.
operator
.
Delete
(
user
,
resource
,
name
),
servererr
.
None
)
handleResponse
(
req
,
resp
,
servererr
.
None
,
h
.
operator
.
Delete
(
user
,
resource
,
name
)
)
}
}
func
handleResponse
(
req
*
restful
.
Request
,
resp
*
restful
.
Response
,
obj
interface
{},
err
error
)
{
func
handleResponse
(
req
*
restful
.
Request
,
resp
*
restful
.
Response
,
obj
interface
{},
err
error
)
{
...
...
pkg/kapis/notification/v2/register.go
→
pkg/kapis/notification/v2
alpha1
/register.go
浏览文件 @
d79104b8
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
*/
*/
package
v2
package
v2
alpha1
import
(
import
(
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful"
...
@@ -38,7 +38,7 @@ const (
...
@@ -38,7 +38,7 @@ const (
KeyOpenAPITags
=
openapi
.
KeyOpenAPITags
KeyOpenAPITags
=
openapi
.
KeyOpenAPITags
)
)
var
GroupVersion
=
schema
.
GroupVersion
{
Group
:
GroupName
,
Version
:
"v2"
}
var
GroupVersion
=
schema
.
GroupVersion
{
Group
:
GroupName
,
Version
:
"v2
alpha1
"
}
func
AddToContainer
(
func
AddToContainer
(
container
*
restful
.
Container
,
container
*
restful
.
Container
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录