Merge pull request #6560 from dokku/josegonzalez-patch-2

Skip app stop/delete when k3s is not installed
This commit is contained in:
Jose Diaz-Gonzalez
2024-02-06 05:16:40 -05:00
committed by GitHub

View File

@@ -1180,6 +1180,12 @@ func TriggerSchedulerPostDelete(scheduler string, appName string) error {
if scheduler != "k3s" {
return nil
}
if err := isK3sInstalled(); err != nil {
common.LogWarn(fmt.Sprintf("Skipping app deletion: %s", err.Error()))
return nil
}
namespace := getComputedNamespace(appName)
helmAgent, err := NewHelmAgent(namespace, DeployLogPrinter)
if err != nil {
@@ -1200,6 +1206,11 @@ func TriggerSchedulerStop(scheduler string, appName string) error {
return nil
}
if err := isK3sInstalled(); err != nil {
common.LogWarn(fmt.Sprintf("Skipping app stop: %s", err.Error()))
return nil
}
ctx, cancel := context.WithCancel(context.Background())
signals := make(chan os.Signal, 1)
signal.Notify(signals, os.Interrupt, syscall.SIGHUP,