feat: kubesphere 4.0 (#6115)
* feat: kubesphere 4.0 Signed-off-by: ci-bot <ci-bot@kubesphere.io> * feat: kubesphere 4.0 Signed-off-by: ci-bot <ci-bot@kubesphere.io> --------- Signed-off-by: ci-bot <ci-bot@kubesphere.io> Co-authored-by: ks-ci-bot <ks-ci-bot@example.com> Co-authored-by: joyceliu <joyceliu@yunify.com>
This commit is contained in:
committed by
GitHub
parent
b5015ec7b9
commit
447a51f08b
@@ -1,18 +1,7 @@
|
||||
/*
|
||||
Copyright 2020 KubeSphere Authors
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
* Please refer to the LICENSE file in the root directory of the project.
|
||||
* https://github.com/kubesphere/kubesphere/blob/master/LICENSE
|
||||
*/
|
||||
|
||||
package v1alpha2
|
||||
|
||||
@@ -22,23 +11,16 @@ import (
|
||||
|
||||
"github.com/emicklei/go-restful/v3"
|
||||
k8serr "k8s.io/apimachinery/pkg/api/errors"
|
||||
"k8s.io/client-go/kubernetes"
|
||||
|
||||
"kubesphere.io/kubesphere/pkg/models/workloads"
|
||||
"kubesphere.io/kubesphere/pkg/server/errors"
|
||||
)
|
||||
|
||||
type operationHandler struct {
|
||||
type handler struct {
|
||||
jobRunner workloads.JobRunner
|
||||
}
|
||||
|
||||
func newOperationHandler(client kubernetes.Interface) *operationHandler {
|
||||
return &operationHandler{
|
||||
jobRunner: workloads.NewJobRunner(client),
|
||||
}
|
||||
}
|
||||
|
||||
func (r *operationHandler) handleJobReRun(request *restful.Request, response *restful.Response) {
|
||||
func (h *handler) JobReRun(request *restful.Request, response *restful.Response) {
|
||||
var err error
|
||||
|
||||
job := request.PathParameter("job")
|
||||
@@ -48,7 +30,7 @@ func (r *operationHandler) handleJobReRun(request *restful.Request, response *re
|
||||
|
||||
switch action {
|
||||
case "rerun":
|
||||
err = r.jobRunner.JobReRun(namespace, job, resourceVersion)
|
||||
err = h.jobRunner.JobReRun(namespace, job, resourceVersion)
|
||||
default:
|
||||
response.WriteHeaderAndEntity(http.StatusBadRequest, errors.Wrap(fmt.Errorf("invalid operation %s", action)))
|
||||
return
|
||||
|
||||
@@ -1,30 +1,22 @@
|
||||
/*
|
||||
Copyright 2019 The KubeSphere Authors.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
* Please refer to the LICENSE file in the root directory of the project.
|
||||
* https://github.com/kubesphere/kubesphere/blob/master/LICENSE
|
||||
*/
|
||||
|
||||
package v1alpha2
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
|
||||
restfulspec "github.com/emicklei/go-restful-openapi/v2"
|
||||
"github.com/emicklei/go-restful/v3"
|
||||
"k8s.io/apimachinery/pkg/runtime/schema"
|
||||
"k8s.io/client-go/kubernetes"
|
||||
runtimeclient "sigs.k8s.io/controller-runtime/pkg/client"
|
||||
|
||||
"kubesphere.io/kubesphere/pkg/api"
|
||||
"kubesphere.io/kubesphere/pkg/apiserver/rest"
|
||||
"kubesphere.io/kubesphere/pkg/apiserver/runtime"
|
||||
"kubesphere.io/kubesphere/pkg/models/workloads"
|
||||
"kubesphere.io/kubesphere/pkg/server/errors"
|
||||
)
|
||||
|
||||
@@ -34,23 +26,31 @@ const (
|
||||
|
||||
var GroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha2"}
|
||||
|
||||
func AddToContainer(c *restful.Container, client kubernetes.Interface) error {
|
||||
func NewHandler(cacheClient runtimeclient.Client) rest.Handler {
|
||||
return &handler{
|
||||
jobRunner: workloads.NewJobRunner(cacheClient),
|
||||
}
|
||||
}
|
||||
|
||||
webservice := runtime.NewWebService(GroupVersion)
|
||||
func NewFakeHandler() rest.Handler {
|
||||
return &handler{}
|
||||
}
|
||||
|
||||
handler := newOperationHandler(client)
|
||||
func (h *handler) AddToContainer(c *restful.Container) error {
|
||||
ws := runtime.NewWebService(GroupVersion)
|
||||
|
||||
webservice.Route(webservice.POST("/namespaces/{namespace}/jobs/{job}").
|
||||
To(handler.handleJobReRun).
|
||||
Doc("Rerun job whether the job is complete or not").
|
||||
ws.Route(ws.POST("/namespaces/{namespace}/jobs/{job}").
|
||||
To(h.JobReRun).
|
||||
Deprecate().
|
||||
Param(webservice.PathParameter("job", "job name")).
|
||||
Param(webservice.PathParameter("namespace", "the name of the namespace where the job runs in")).
|
||||
Param(webservice.QueryParameter("action", "action must be \"rerun\"")).
|
||||
Param(webservice.QueryParameter("resourceVersion", "version of job, rerun when the version matches").Required(true)).
|
||||
Doc("Job rerun").
|
||||
Metadata(restfulspec.KeyOpenAPITags, []string{api.TagAdvancedOperations}).
|
||||
Notes("Rerun job whether the job is complete or not.").
|
||||
Param(ws.PathParameter("job", "job name")).
|
||||
Param(ws.PathParameter("namespace", "The specified namespace.")).
|
||||
Param(ws.QueryParameter("action", "action must be \"rerun\"")).
|
||||
Param(ws.QueryParameter("resourceVersion", "version of job, rerun when the version matches").Required(true)).
|
||||
Returns(http.StatusOK, api.StatusOK, errors.Error{}))
|
||||
|
||||
c.Add(webservice)
|
||||
|
||||
c.Add(ws)
|
||||
return nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user