Skip existing Kitfiles when generating a new Kitfile.

pkg/lib/constants/consts.go

@@ -60,6 +60,15 @@ func DefaultKitfileNames() []string {
 	return []string{"Kitfile", "kitfile", ".kitfile"}
 }
 
+func IsDefaultKitfileName(filename string) bool {
+	for _, name := range DefaultKitfileNames() {
+		if name == filename {
+			return true
+		}
+	}
+	return false
+}
+
 // DefaultConfigPath returns the default configuration and cache directory for the CLI.
 // This is platform-dependent, using
 //   - $XDG_DATA_HOME/kitops on Linux, with fall back to $HOME/.local/share/kitops

pkg/lib/kitfile/generate.go

@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"io/fs"
 	"kitops/pkg/artifact"
+	"kitops/pkg/lib/constants"
 	"kitops/pkg/output"
 	"os"
 	"path/filepath"
@@ -91,6 +92,11 @@ func GenerateKitfile(baseDir string, packageOpt *artifact.Package) (*artifact.Ki
 	var detectedLicenseType string
 	for _, d := range ds {
 		filename := d.Name()
+		if constants.IsDefaultKitfileName(filename) {
+			// Skip Kitfile files (if present in the directory...). These won't be packed
+			// either way.
+			continue
+		}
 		if d.IsDir() {
 			dirModelFiles, err := addDirToKitfile(kitfile, filename, d)
 			if err != nil {