mirror of
https://github.com/kubeshark/kubeshark.git
synced 2025-06-24 07:14:15 +00:00
⚡ Clean YAML files before generating the new ones in manifests
and helm-chart
command
This commit is contained in:
parent
e65656c1df
commit
2780791068
@ -10,6 +10,7 @@ import (
|
|||||||
"github.com/kubeshark/kubeshark/config"
|
"github.com/kubeshark/kubeshark/config"
|
||||||
"github.com/kubeshark/kubeshark/kubernetes"
|
"github.com/kubeshark/kubeshark/kubernetes"
|
||||||
"github.com/kubeshark/kubeshark/misc"
|
"github.com/kubeshark/kubeshark/misc"
|
||||||
|
"github.com/kubeshark/kubeshark/misc/fsUtils"
|
||||||
"github.com/kubeshark/kubeshark/utils"
|
"github.com/kubeshark/kubeshark/utils"
|
||||||
"github.com/ohler55/ojg/jp"
|
"github.com/ohler55/ojg/jp"
|
||||||
"github.com/ohler55/ojg/oj"
|
"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 {
|
func dumpHelmChart(objects map[string]interface{}) error {
|
||||||
folder := filepath.Join(".", "helm-chart")
|
folder := filepath.Join(".", "helm-chart")
|
||||||
templatesFolder := filepath.Join(folder, "templates")
|
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 {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
@ -10,6 +10,7 @@ import (
|
|||||||
"github.com/kubeshark/kubeshark/config"
|
"github.com/kubeshark/kubeshark/config"
|
||||||
"github.com/kubeshark/kubeshark/docker"
|
"github.com/kubeshark/kubeshark/docker"
|
||||||
"github.com/kubeshark/kubeshark/kubernetes"
|
"github.com/kubeshark/kubeshark/kubernetes"
|
||||||
|
"github.com/kubeshark/kubeshark/misc/fsUtils"
|
||||||
"github.com/kubeshark/kubeshark/utils"
|
"github.com/kubeshark/kubeshark/utils"
|
||||||
"github.com/rs/zerolog/log"
|
"github.com/rs/zerolog/log"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
@ -173,7 +174,13 @@ func generateManifests() (
|
|||||||
|
|
||||||
func dumpManifests(objects map[string]interface{}) error {
|
func dumpManifests(objects map[string]interface{}) error {
|
||||||
folder := filepath.Join(".", "manifests")
|
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 {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
22
misc/fsUtils/globUtils.go
Normal file
22
misc/fsUtils/globUtils.go
Normal file
@ -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
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user