|
@@ -2,7 +2,9 @@ package environment
|
|
|
|
|
|
|
|
import (
|
|
import (
|
|
|
"net/http"
|
|
"net/http"
|
|
|
|
|
+ "strings"
|
|
|
|
|
|
|
|
|
|
+ "github.com/porter-dev/porter/api/server/authz"
|
|
|
"github.com/porter-dev/porter/api/server/handlers"
|
|
"github.com/porter-dev/porter/api/server/handlers"
|
|
|
"github.com/porter-dev/porter/api/server/shared"
|
|
"github.com/porter-dev/porter/api/server/shared"
|
|
|
"github.com/porter-dev/porter/api/server/shared/apierrors"
|
|
"github.com/porter-dev/porter/api/server/shared/apierrors"
|
|
@@ -14,6 +16,7 @@ import (
|
|
|
|
|
|
|
|
type DeleteDeploymentHandler struct {
|
|
type DeleteDeploymentHandler struct {
|
|
|
handlers.PorterHandlerReadWriter
|
|
handlers.PorterHandlerReadWriter
|
|
|
|
|
+ authz.KubernetesAgentGetter
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
func NewDeleteDeploymentHandler(
|
|
func NewDeleteDeploymentHandler(
|
|
@@ -23,6 +26,7 @@ func NewDeleteDeploymentHandler(
|
|
|
) *DeleteDeploymentHandler {
|
|
) *DeleteDeploymentHandler {
|
|
|
return &DeleteDeploymentHandler{
|
|
return &DeleteDeploymentHandler{
|
|
|
PorterHandlerReadWriter: handlers.NewDefaultPorterHandler(config, decoderValidator, writer),
|
|
PorterHandlerReadWriter: handlers.NewDefaultPorterHandler(config, decoderValidator, writer),
|
|
|
|
|
+ KubernetesAgentGetter: authz.NewOutOfClusterAgentGetter(config),
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -53,6 +57,24 @@ func (c *DeleteDeploymentHandler) ServeHTTP(w http.ResponseWriter, r *http.Reque
|
|
|
return
|
|
return
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ // delete corresponding namespace
|
|
|
|
|
+ agent, err := c.GetAgent(r, cluster, "")
|
|
|
|
|
+
|
|
|
|
|
+ if err != nil {
|
|
|
|
|
+ c.HandleAPIError(w, r, apierrors.NewErrInternal(err))
|
|
|
|
|
+ return
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ // make sure we don't delete default or kube-system by checking for prefix, for now
|
|
|
|
|
+ if strings.Contains(depl.Namespace, "pr-") {
|
|
|
|
|
+ err = agent.DeleteNamespace(depl.Namespace)
|
|
|
|
|
+
|
|
|
|
|
+ if err != nil {
|
|
|
|
|
+ c.HandleAPIError(w, r, apierrors.NewErrInternal(err))
|
|
|
|
|
+ return
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
// TODO: delete corresponding Github actions files using the client
|
|
// TODO: delete corresponding Github actions files using the client
|
|
|
// client, err := getGithubClientFromEnvironment(c.Config(), env)
|
|
// client, err := getGithubClientFromEnvironment(c.Config(), env)
|
|
|
|
|
|