Update the multiline annotation and use helmify.Values to add the options in the values.yaml

Signed-off-by: dashanji <[email protected]>

Author: dashanji

README.md

@@ -86,7 +86,7 @@ Usage:
 | -version | Print helmify version.                                                                                                                                                                                      | `helmify -version`|
 | -crd-dir | Place crds in their own folder per Helm 3 [docs](https://helm.sh/docs/chart_best_practices/custom_resource_definitions/#method-1-let-helm-do-it-for-you). Caveat: CRDs templating is not supported by Helm. | `helmify -crd-dir`|
 | -image-pull-secrets| Allows the user to use existing secrets as imagePullSecrets  | `helmify -image-pull-secrets`|
-
+| -cert-manager-as-subchart | Allows the user to install cert-manager as a subchart  | `helmify -cert-manager-as-subchart`|
 ## Status
 Supported k8s resources:
 - Deployment, DaemonSet, StatefulSet

pkg/helm/chart.go

@@ -56,7 +56,7 @@ func (o output) Create(chartDir, chartName string, crd bool, certManagerAsSubcha
 			return err
 		}
 	}
-	err = overwriteValuesFile(cDir, values)
+	err = overwriteValuesFile(cDir, values, certManagerAsSubchart)
 	if err != nil {
 		return err
 	}
@@ -101,14 +101,17 @@ func overwriteTemplateFile(filename, chartDir string, crd bool, templates []helm
 	return nil
 }
 
-func overwriteValuesFile(chartDir string, values helmify.Values) error {
+func overwriteValuesFile(chartDir string, values helmify.Values, certManagerAsSubchart bool) error {
+	if certManagerAsSubchart {
+		values.Add(true, "cert-manager", "installCRDs")
+		values.Add(true, "cert-manager", "enabled")
+	}
 	res, err := yaml.Marshal(values)
 	if err != nil {
 		return errors.Wrap(err, "unable to write marshal values.yaml")
 	}
 
 	file := filepath.Join(chartDir, "values.yaml")
-	res = append(res, []byte("cert-manager:\n  enabled: false\n  installCRDs: true")...)
 	err = ioutil.WriteFile(file, res, 0600)
 	if err != nil {
 		return errors.Wrap(err, "unable to write values.yaml")

pkg/helm/init.go

@@ -183,9 +183,14 @@ func createCommonFiles(chartDir, chartName string, crd bool, certManagerAsSubcha
 
 func chartYAML(appName string, certManagerAsSubchart bool) []byte {
 	chartFile := defaultChartfile
+	annotatins := `
+dependencies:
+  - name: cert-manager
+    version: 1.9.1
+    repository: https://charts.jetstack.io
+    condition: certManager.enabled`
 	if certManagerAsSubchart {
-		chartFile += "\ndependencies:\n  - name: cert-manager\n    version: 1.9.1\n" +
-			"    repository: https://charts.jetstack.io\n    condition: cert-manager.enabled"
+		chartFile += annotatins
 	}
 	return []byte(fmt.Sprintf(chartFile, appName))
 }