diff --git a/cmd/helmChart.go b/cmd/helmChart.go index 4f4dbcc37..c1871318a 100644 --- a/cmd/helmChart.go +++ b/cmd/helmChart.go @@ -10,6 +10,7 @@ import ( "github.com/kubeshark/kubeshark/config" "github.com/kubeshark/kubeshark/kubernetes" "github.com/kubeshark/kubeshark/misc" + "github.com/kubeshark/kubeshark/misc/fsUtils" "github.com/kubeshark/kubeshark/utils" "github.com/ohler55/ojg/jp" "github.com/ohler55/ojg/oj" @@ -258,7 +259,13 @@ func template(object interface{}, mappings map[string]interface{}) (template int func dumpHelmChart(objects map[string]interface{}) error { folder := filepath.Join(".", "helm-chart") templatesFolder := filepath.Join(folder, "templates") - err := os.MkdirAll(templatesFolder, os.ModePerm) + + err := fsUtils.RemoveFilesByExtension(templatesFolder, "yaml") + if err != nil { + return err + } + + err = os.MkdirAll(templatesFolder, os.ModePerm) if err != nil { return err } diff --git a/cmd/manifests.go b/cmd/manifests.go index a589d2a6f..adaa76b8d 100644 --- a/cmd/manifests.go +++ b/cmd/manifests.go @@ -10,6 +10,7 @@ import ( "github.com/kubeshark/kubeshark/config" "github.com/kubeshark/kubeshark/docker" "github.com/kubeshark/kubeshark/kubernetes" + "github.com/kubeshark/kubeshark/misc/fsUtils" "github.com/kubeshark/kubeshark/utils" "github.com/rs/zerolog/log" "github.com/spf13/cobra" @@ -173,7 +174,13 @@ func generateManifests() ( func dumpManifests(objects map[string]interface{}) error { folder := filepath.Join(".", "manifests") - err := os.MkdirAll(folder, os.ModePerm) + + err := fsUtils.RemoveFilesByExtension(folder, "yaml") + if err != nil { + return err + } + + err = os.MkdirAll(folder, os.ModePerm) if err != nil { return err } diff --git a/misc/fsUtils/globUtils.go b/misc/fsUtils/globUtils.go new file mode 100644 index 000000000..9a4cf91b0 --- /dev/null +++ b/misc/fsUtils/globUtils.go @@ -0,0 +1,22 @@ +package fsUtils + +import ( + "fmt" + "os" + "path/filepath" +) + +func RemoveFilesByExtension(dirPath string, ext string) error { + files, err := filepath.Glob(filepath.Join(dirPath, fmt.Sprintf("/*.%s", ext))) + if err != nil { + return err + } + + for _, f := range files { + if err := os.Remove(f); err != nil { + return err + } + } + + return nil +}