Merge pull request #2 from epinio/add-predelete-to-uninstall

Add preDelete action for uninstall
epinio · Dec 2, 2021 · 78035bc · 78035bc
2 parents f97f688 + 0fadd98
commit 78035bc
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 2 deletions.
diff --git a/cmd/internal/installer/cli/uninstall.go b/cmd/internal/installer/cli/uninstall.go
@@ -6,6 +6,7 @@ import (
 	"github.com/spf13/viper"
 
 	"github.com/epinio/epinio/helpers/tracelog"
+	"github.com/epinio/installer/internal/duration"
 	"github.com/epinio/installer/internal/installer"
 	"github.com/epinio/installer/internal/kubernetes"
 )
@@ -44,7 +45,8 @@ func uninstall(cmd *cobra.Command, args []string) error {
 
 	log.Info("plan", "components", p.String())
 
-	act := installer.NewUninstall(cluster, log)
+	ca := installer.NewComponentActions(cluster, log, duration.ToDeployment())
+	act := installer.NewUninstall(cluster, log, ca)
 
 	installer.ReverseWalk(ctx, m.Components, act)
 	if err != nil {

diff --git a/internal/installer/manifest.go b/internal/installer/manifest.go
@@ -41,6 +41,9 @@ type Component struct {
 	// Type is 'helm' or 'yaml'
 	Type ComponentType `json:"type" yaml:"type"`
 
+	// PreDelete checks make sure the component can be uninstalled
+	PreDelete []ComponentAction `json:"pre_delete_check,omitempty" yaml:"preDelete"`
+
 	// PreDeploy checks make sure the component can be installed
 	PreDeploy []ComponentAction `json:"pre_deploy_check,omitempty" yaml:"preDeploy"`
 

diff --git a/internal/installer/uninstall.go b/internal/installer/uninstall.go
@@ -12,12 +12,14 @@ import (
 type Uninstall struct {
 	cluster *kubernetes.Cluster
 	log     logr.Logger
+	ca      *ComponentActions
 }
 
 var _ Action = &Uninstall{}
 
-func NewUninstall(cluster *kubernetes.Cluster, log logr.Logger) *Uninstall {
+func NewUninstall(cluster *kubernetes.Cluster, log logr.Logger, ca *ComponentActions) *Uninstall {
 	return &Uninstall{
+		ca:      ca,
 		cluster: cluster,
 		log:     log,
 	}
@@ -27,6 +29,13 @@ func (u Uninstall) Apply(ctx context.Context, c Component) error {
 	log := u.log.WithValues("component", c.ID, "type", c.Type)
 	log.Info("apply uninstall")
 
+	for _, chk := range c.PreDelete {
+		log.V(2).Info("pre deploy", "checkType", string(chk.Type))
+		if err := u.ca.Run(ctx, c, chk); err != nil {
+			return err
+		}
+	}
+
 	switch c.Type {
 	case Helm:
 		{

diff --git a/internal/installer/yaml.go b/internal/installer/yaml.go
@@ -15,6 +15,14 @@ import (
 )
 
 func yamlApply(log logr.Logger, c Component) error {
+	if c.Source.URL != "" {
+		return errors.New("URL not supported by YAML component")
+	}
+
+	if c.Source.Path == "" {
+		return errors.New("Empty path for YAML component")
+	}
+
 	path := c.Source.Path
 	if len(c.Values) > 0 {
 		var err error