Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Bug] Forbid the namespace deleting if there is still some resource under it #320

Merged
merged 2 commits into from
Sep 20, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion src/namespace/namespace.go
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
package namespace

import (
"fmt"

"github.com/linkernetworks/vortex/src/entity"
"github.com/linkernetworks/vortex/src/serviceprovider"

corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
)

// CreateNamespace will create namespace by serviceprovider container
func CreateNamespace(sp *serviceprovider.Container, namespace *entity.Namespace) error {
n := corev1.Namespace{
ObjectMeta: metav1.ObjectMeta{
Name: namespace.Name,
Name: namespace.Name,
},
}
_, err := sp.KubeCtl.CreateNamespace(&n)
Expand All @@ -21,5 +25,14 @@ func CreateNamespace(sp *serviceprovider.Container, namespace *entity.Namespace)

// DeleteNamespace will delete namespace
func DeleteNamespace(sp *serviceprovider.Container, namespace *entity.Namespace) error {
deploys, err1 := sp.KubeCtl.GetDeployments(namespace.Name)
svcs, err2 := sp.KubeCtl.GetServices(namespace.Name)
pvcs, err3 := sp.KubeCtl.GetPVCs(namespace.Name)

//err from deployment/services/pvc should not return in namespace function
if (err1 == nil && err2 == nil && err3 == nil) && (len(deploys) != 0 || len(svcs) != 0 || len(pvcs) != 0) {
return errors.NewForbidden(schema.GroupResource{Group: "none", Resource: "Namespace"}, namespace.Name, fmt.Errorf("Still have some resource under namespace %v", namespace.Name))
}

return sp.KubeCtl.DeleteNamespace(namespace.Name)
}
5 changes: 5 additions & 0 deletions src/net/http/response.go
Original file line number Diff line number Diff line change
Expand Up @@ -112,3 +112,8 @@ func MethodNotAllow(req *http.Request, resp http.ResponseWriter, errs ...error)
func UnprocessableEntity(req *http.Request, resp http.ResponseWriter, errs ...error) (int, error) {
return WriteStatusAndError(req, resp, http.StatusUnprocessableEntity, errs...)
}

// NotAcceptable will set the status code http.StatusNotAcceptable to the HTTP response message
func NotAcceptable(req *http.Request, resp http.ResponseWriter, errs ...error) (int, error) {
return WriteStatusAndError(req, resp, http.StatusNotAcceptable, errs...)
}
2 changes: 2 additions & 0 deletions src/server/handler_namespace.go
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@ func deleteNamespaceHandler(ctx *web.Context) {
if err := namespace.DeleteNamespace(sp, &n); err != nil {
if errors.IsNotFound(err) {
response.NotFound(req.Request, resp.ResponseWriter, err)
} else if errors.IsForbidden(err) {
response.NotAcceptable(req.Request, resp.ResponseWriter, err)
} else {
response.InternalServerError(req.Request, resp.ResponseWriter, err)
}
Expand Down