Fixed merge conficts from rebase

Author: ShahNewazKhan

cmd/generate.go

@@ -1,20 +1,19 @@
 package cmd
 
 import (
-
-	"log"
-	"sync"
 	"github.com/commitdev/commit0/internal/config"
 	"github.com/commitdev/commit0/internal/generate/docker"
 	"github.com/commitdev/commit0/internal/generate/golang"
 	"github.com/commitdev/commit0/internal/generate/http"
+	"github.com/commitdev/commit0/internal/generate/kubernetes"
 	"github.com/commitdev/commit0/internal/generate/proto"
 	"github.com/commitdev/commit0/internal/generate/react"
-	"github.com/commitdev/commit0/internal/generate/kubernetes"
 	"github.com/commitdev/commit0/internal/templator"
 	"github.com/commitdev/commit0/internal/util"
 	"github.com/gobuffalo/packr/v2"
 	"github.com/spf13/cobra"
+	"log"
+	"sync"
 )
 
 var configPath string
@@ -62,7 +61,7 @@ var generateCmd = &cobra.Command{
 		case React:
 			react.Generate(t, cfg, &wg)
 		case Kubernetes:
-			kubernetes.Generate(Templator, cfg)
+			kubernetes.Generate(t, cfg, &wg)
 		}
 
 		util.TemplateFileIfDoesNotExist("", "README.md", t.Readme, &wg, cfg)

go.sum

@@ -72,8 +72,6 @@ github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:
 golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392 h1:ACG4HJsFiNMf47Y4PeRoebLNy/2lXT9EtprMuTFWt1M=
-golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 h1:ObdrDkeb4kJdCP557AjRjq69pTHfNouLtWZG7j9rPN8=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=

internal/generate/kubernetes/generate.go

@@ -2,8 +2,8 @@ package kubernetes
 
 import (
 	"bytes"
-	"github.com/commitdev/commit0/config"
-	"github.com/commitdev/commit0/templator"
+	"github.com/commitdev/commit0/internal/config"
+	"github.com/commitdev/commit0/internal/templator"
 	"io"
 	"log"
 	"os"
@@ -12,8 +12,8 @@ import (
 	"sync"
 )
 
-func Generate(templator *templator.Templator, config *config.Commit0Config) {
-	templator.Kubernetes.TemplateFiles(config, false)
+func Generate(templator *templator.Templator, config *config.Commit0Config, wg *sync.WaitGroup) {
+	templator.Kubernetes.TemplateFiles(config, false, wg)
 
 	if config.Kubernetes.Deploy {
 		_tf_init := tf_init()

internal/templator/templator.go

@@ -41,6 +41,7 @@ type Templator struct {
 	Go                   *GoTemplator
 	Docker               *DockerTemplator
 	React                *DirectoryTemplator
+	Kubernetes           *DirectoryTemplator
 }
 
 func NewTemplator(box *packr.Box) *Templator {
@@ -54,6 +55,7 @@ func NewTemplator(box *packr.Box) *Templator {
 		Readme:               NewSingleFileTemplator(box, "util/README.tmpl"),
 		Docker:               NewDockerFileTemplator(box),
 		React:                NewDirectoryTemplator(box, "react"),
+		Kubernetes:           NewDirectoryTemplator(box, "kubernetes"),
 	}
 }