tear down if there is no site configured

Author: nluaces

internal/nonkube/bootstrap/teardown.go

@@ -22,20 +22,7 @@ func Teardown(namespace string) error {
 	if err != nil {
 		return err
 	}
-	if err := removeRouter(namespace, platform); err != nil {
-		return err
-	}
-
-	if err := removeService(namespace, platform); err != nil {
-		return err
-	}
-
-	if err := removeDefinition(namespace); err != nil {
-		return err
-	}
-
-	fmt.Printf("Namespace \"%s\" has been removed\n", namespace)
-	return nil
+	return RemoveAll(namespace, platform)
 
 }
 
@@ -52,10 +39,19 @@ func removeDefinition(namespace string) error {
 func removeRouter(namespace string, platform string) error {
 
 	endpoint := os.Getenv("CONTAINER_ENDPOINT")
-	if endpoint == "" {
-		endpoint = fmt.Sprintf("unix://%s/podman/podman.sock", api.GetRuntimeDir())
+
+	// the container endpoint is mapped to the podman socket inside the container
+	if api.IsRunningInContainer() {
+		endpoint = "unix:///var/run/podman.sock"
 		if platform == "docker" {
-			endpoint = "unix:///run/docker.sock"
+			endpoint = "unix:///var/run/docker.sock"
+		}
+	} else {
+		if endpoint == "" {
+			endpoint = fmt.Sprintf("unix://%s/podman/podman.sock", api.GetRuntimeDir())
+			if platform == "docker" {
+				endpoint = "unix:///run/docker.sock"
+			}
 		}
 	}
 
@@ -102,3 +98,22 @@ func removeService(namespace string, platform string) error {
 
 	return nil
 }
+
+func RemoveAll(namespace string, platform string) error {
+
+	if err := removeRouter(namespace, platform); err != nil {
+		return err
+	}
+
+	if err := removeService(namespace, platform); err != nil {
+		return err
+	}
+
+	if err := removeDefinition(namespace); err != nil {
+		return err
+	}
+
+	fmt.Printf("Namespace \"%s\" has been removed\n", namespace)
+	return nil
+
+}

internal/nonkube/controller/input_resource_handler.go

@@ -10,6 +10,7 @@ import (
 	"github.com/skupperproject/skupper/api/types"
 	"github.com/skupperproject/skupper/internal/cmd/skupper/common"
 	"github.com/skupperproject/skupper/internal/nonkube/bootstrap"
+	common2 "github.com/skupperproject/skupper/internal/nonkube/common"
 	"github.com/skupperproject/skupper/internal/utils"
 	"github.com/skupperproject/skupper/pkg/nonkube/api"
 )
@@ -22,11 +23,12 @@ type InputResourceHandler struct {
 	inputPath       string
 	Bootstrap       func(config *bootstrap.Config) (*api.SiteState, error)
 	PostExec        func(config *bootstrap.Config, siteState *api.SiteState)
+	TearDown        func(namespace string, platform string) error
 	ConfigBootstrap bootstrap.Config
 	lock            sync.Mutex
 }
 
-func NewInputResourceHandler(namespace string, inputPath string, bStrap func(config *bootstrap.Config) (*api.SiteState, error), postBootStrap func(config *bootstrap.Config, siteState *api.SiteState)) *InputResourceHandler {
+func NewInputResourceHandler(namespace string, inputPath string, bStrap func(config *bootstrap.Config) (*api.SiteState, error), postBootStrap func(config *bootstrap.Config, siteState *api.SiteState), tearDown func(namespace string, platform string) error) *InputResourceHandler {
 
 	systemReloadType := utils.DefaultStr(os.Getenv(types.ENV_SYSTEM_AUTO_RELOAD),
 		types.SystemReloadTypeManual)
@@ -43,6 +45,7 @@ func NewInputResourceHandler(namespace string, inputPath string, bStrap func(con
 
 	handler.Bootstrap = bStrap
 	handler.PostExec = postBootStrap
+	handler.TearDown = tearDown
 
 	var binary string
 
@@ -75,6 +78,9 @@ func NewInputResourceHandler(namespace string, inputPath string, bStrap func(con
 }
 
 func (h *InputResourceHandler) OnCreate(name string) {
+	h.lock.Lock()
+	defer h.lock.Unlock()
+
 	h.logger.Info(fmt.Sprintf("Resource has been created: %s", name))
 	err := h.processInputFile()
 	if err != nil {
@@ -89,8 +95,27 @@ func (h *InputResourceHandler) OnCreate(name string) {
 // tries to create a new router pod, failing on this)
 func (h *InputResourceHandler) OnUpdate(name string) {}
 func (h *InputResourceHandler) OnRemove(name string) {
+	h.lock.Lock()
+	defer h.lock.Unlock()
+
 	h.logger.Info(fmt.Sprintf("Resource has been deleted: %s", name))
-	err := h.processInputFile()
+
+	siteStateLoader := &common2.FileSystemSiteStateLoader{
+		Path:   h.ConfigBootstrap.InputPath,
+		Bundle: h.ConfigBootstrap.IsBundle,
+	}
+	siteState, err := siteStateLoader.Load()
+
+	//If there is no site configured, the namespace needs to be removed
+	if err != nil || siteState == nil || siteState.Site == nil {
+		err = h.tearDownNamespace()
+		if err != nil {
+			h.logger.Error(err.Error())
+		}
+		return
+	}
+
+	err = h.processInputFile()
 	if err != nil {
 		h.logger.Error(err.Error())
 	}
@@ -102,9 +127,6 @@ func (h *InputResourceHandler) Filter(name string) bool {
 func (h *InputResourceHandler) OnBasePathAdded(basePath string) {}
 
 func (h *InputResourceHandler) processInputFile() error {
-	h.lock.Lock()
-	defer h.lock.Unlock()
-
 	siteState, err := h.Bootstrap(&h.ConfigBootstrap)
 	if err != nil {
 		return fmt.Errorf("Failed to bootstrap: %s", err)
@@ -114,3 +136,13 @@ func (h *InputResourceHandler) processInputFile() error {
 
 	return nil
 }
+
+func (h *InputResourceHandler) tearDownNamespace() error {
+	h.logger.Info("No site configured, tearing down namespace")
+	err := h.TearDown(h.namespace, string(h.ConfigBootstrap.Platform))
+	if err != nil {
+		return err
+	}
+
+	return nil
+}

internal/nonkube/controller/namespace_controller.go

@@ -45,7 +45,7 @@ func (w *NamespaceController) Start() {
 		routerConfigHandler.AddCallback(routerStateHandler)
 		collectorLifecycleHandler := NewCollectorLifecycleHandler(w.ns)
 		routerStateHandler.SetCallback(collectorLifecycleHandler)
-		inputResourceHandler := NewInputResourceHandler(w.ns, w.pathProvider.GetNamespace(), bootstrap.Bootstrap, bootstrap.PostBootstrap)
+		inputResourceHandler := NewInputResourceHandler(w.ns, w.pathProvider.GetNamespace(), bootstrap.Bootstrap, bootstrap.PostBootstrap, bootstrap.RemoveAll)
 
 		w.watcher.Add(api.GetInternalOutputPath(w.ns, api.RouterConfigPath), routerConfigHandler)
 		w.watcher.Add(api.GetInternalOutputPath(w.ns, api.RuntimeSiteStatePath), NewNetworkStatusHandler(w.ns))