added cert-manager-version flag

Author: rebenkoy

cmd/helmify/flags.go

@@ -64,6 +64,7 @@ func ReadFlags() config.Config {
 	flag.BoolVar(&result.ImagePullSecrets, "image-pull-secrets", false, "Allows the user to use existing secrets as imagePullSecrets in values.yaml")
 	flag.BoolVar(&result.GenerateDefaults, "generate-defaults", false, "Allows the user to add empty placeholders for tipical customization options in values.yaml. Currently covers: topology constraints, node selectors, tolerances")
 	flag.BoolVar(&result.CertManagerAsSubchart, "cert-manager-as-subchart", false, "Allows the user to add cert-manager as a subchart")
+	flag.StringVar(&result.CertManagerVersion, "cert-manager-version", "v1.12.2", "Allows to define cert-manager version. Only useful with cert-manager-as-subchart.")
 	flag.BoolVar(&result.FilesRecursively, "r", false, "Scan dirs from -f option recursively")
 	flag.Var(&files, "f", "File or directory containing k8s manifests")
 

pkg/app/context.go

@@ -75,7 +75,7 @@ func (c *appContext) CreateHelm(stop <-chan struct{}) error {
 		default:
 		}
 	}
-	return c.output.Create(c.config.ChartDir, c.config.ChartName, c.config.Crd, c.config.CertManagerAsSubchart, templates, filenames)
+	return c.output.Create(c.config.ChartDir, c.config.ChartName, c.config.Crd, c.config.CertManagerAsSubchart, c.config.CertManagerVersion , templates, filenames)
 }
 
 func (c *appContext) process(obj *unstructured.Unstructured) (helmify.Template, error) {

pkg/config/config.go

@@ -28,6 +28,8 @@ type Config struct {
 	GenerateDefaults bool
 	// CertManagerAsSubchart enables the generation of a subchart for cert-manager
 	CertManagerAsSubchart bool
+	// CertManagerVersion sets cert-manager version in dependency
+	CertManagerVersion string
 	// Files - directories or files with k8s manifests
 	Files []string
 	// FilesRecursively read Files recursively

pkg/helm/chart.go

@@ -31,8 +31,8 @@ type output struct{}
 //	    └── _helpers.tp   # Helm default template partials
 //
 // Overwrites existing values.yaml and templates in templates dir on every run.
-func (o output) Create(chartDir, chartName string, crd bool, certManagerAsSubchart bool, templates []helmify.Template, filenames []string) error {
-	err := initChartDir(chartDir, chartName, crd, certManagerAsSubchart)
+func (o output) Create(chartDir, chartName string, crd bool, certManagerAsSubchart bool, certManagerVersion string, templates []helmify.Template, filenames []string) error {
+	err := initChartDir(chartDir, chartName, crd, certManagerAsSubchart, certManagerVersion)
 	if err != nil {
 		return err
 	}

pkg/helm/init.go

@@ -129,23 +129,24 @@ dependencies:
   - name: cert-manager
     repository: https://charts.jetstack.io
     condition: certmanager.enabled
-	alias: certmanager
+    alias: certmanager
+    version: %q
 `
 
 var chartName = regexp.MustCompile("^[a-zA-Z0-9._-]+$")
 
 const maxChartNameLength = 250
 
 // initChartDir - creates Helm chart structure in chartName directory if not presented.
-func initChartDir(chartDir, chartName string, crd bool, certManagerAsSubchart bool) error {
+func initChartDir(chartDir, chartName string, crd bool, certManagerAsSubchart bool, certManagerVersion string) error {
 	if err := validateChartName(chartName); err != nil {
 		return err
 	}
 
 	cDir := filepath.Join(chartDir, chartName)
 	_, err := os.Stat(filepath.Join(cDir, "Chart.yaml"))
 	if os.IsNotExist(err) {
-		return createCommonFiles(chartDir, chartName, crd, certManagerAsSubchart)
+		return createCommonFiles(chartDir, chartName, crd, certManagerAsSubchart, certManagerVersion)
 	}
 	logrus.Info("Skip creating Chart skeleton: Chart.yaml already exists.")
 	return err
@@ -161,7 +162,7 @@ func validateChartName(name string) error {
 	return nil
 }
 
-func createCommonFiles(chartDir, chartName string, crd bool, certManagerAsSubchart bool) error {
+func createCommonFiles(chartDir, chartName string, crd bool, certManagerAsSubchart bool, certManagerVersion string) error {
 	cDir := filepath.Join(chartDir, chartName)
 	err := os.MkdirAll(filepath.Join(cDir, "templates"), 0750)
 	if err != nil {
@@ -183,16 +184,16 @@ func createCommonFiles(chartDir, chartName string, crd bool, certManagerAsSubcha
 			logrus.WithField("file", file).Info("created")
 		}
 	}
-	createFile(chartYAML(chartName, certManagerAsSubchart), cDir, "Chart.yaml")
+	createFile(chartYAML(chartName, certManagerAsSubchart, certManagerVersion), cDir, "Chart.yaml")
 	createFile([]byte(helmIgnore), cDir, ".helmignore")
 	createFile(helpersYAML(chartName), cDir, "templates", "_helpers.tpl")
 	return err
 }
 
-func chartYAML(appName string, certManagerAsSubchart bool) []byte {
+func chartYAML(appName string, certManagerAsSubchart bool, certManagerVersion string) []byte {
 	chartFile := defaultChartfile
 	if certManagerAsSubchart {
-		chartFile += certManagerDependencies
+		chartFile += fmt.Sprintf(certManagerDependencies, certManagerVersion)
 	}
 	return []byte(fmt.Sprintf(chartFile, appName))
 }

pkg/helmify/model.go

@@ -28,7 +28,7 @@ type Template interface {
 
 // Output - converts Template into helm chart on disk.
 type Output interface {
-	Create(chartName, chartDir string, Crd bool, certManagerAsSubchart bool, templates []Template, filenames []string) error
+	Create(chartName, chartDir string, Crd bool, certManagerAsSubchart bool, certManagerVersion string, templates []Template, filenames []string) error
 }
 
 // AppMetadata handle common information about K8s objects in the chart.