提交 d79104b8 编写于 作者: W wanjunlei

change api version to v2alpha1

Signed-off-by: Nwanjunlei <wanjunlei@yunify.com>
上级 5e39b7c7
...@@ -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" notificationv2alpha1 "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(notificationv2alpha1.AddToContainer(s.container, s.InformerFactory, s.KubernetesClient.Kubernetes(),
s.KubernetesClient.KubeSphere())) s.KubernetesClient.KubeSphere()))
} }
......
...@@ -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 v2alpha1
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) {
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
*/ */
package v2 package v2alpha1
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: "v2alpha1"}
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.
先完成此消息的编辑!
想要评论请 注册