PR feedback updates

Author: arcanez

README.md

@@ -113,6 +113,7 @@ Usage:
 | -cert-manager-install-crd     | Allows the user to install cert-manager CRD as part of the cert-manager subchart.(default "true")                                                                                                           | `helmify -cert-manager-install-crd` |
 | -preserve-ns              | Allows users to use the object's original namespace instead of adding all the resources to a common namespace. (default "false")                                                                            | `helmify -preserve-ns`              |
 | -add-webhook-option | Adds an option to enable/disable webhook installation  | `helmify -add-webhook-option`|
+| -optional-crds | Enable optional CRD installation through values. | `helmify -optional-crds` |
 ## Status
 Supported k8s resources:
 - Deployment, DaemonSet, StatefulSet

cmd/helmify/flags.go

@@ -71,8 +71,7 @@ func ReadFlags() config.Config {
 	flag.Var(&files, "f", "File or directory containing k8s manifests.")
 	flag.BoolVar(&preservens, "preserve-ns", false, "Use the object's original namespace instead of adding all the resources to a common namespace.")
 	flag.BoolVar(&result.AddWebhookOption, "add-webhook-option", false, "Allows the user to add webhook option in values.yaml.")
-	flag.BoolVar(&result.WrapCRDs, "wrap-crds", false, "Allows the user to wrap CRDs in a conditional.")
-	flag.StringVar(&result.WrapCRDsCondition, "wrap-crds-condition", "crds.enabled", "Allows the user to wrap CRDs in helm chart by specifying a condition name.")
+	flag.BoolVar(&result.OptionalCRDs, "optional-crds", false, "Enable optional CRD installation through values.")
 
 	flag.Parse()
 	if h || help {

pkg/config/config.go

@@ -43,10 +43,8 @@ type Config struct {
 	PreserveNs bool
 	// AddWebhookOption enables the generation of a webhook option in values.yaml
 	AddWebhookOption bool
-	// WrapCRDs wraps Custom Resource Definitions in a conditional
-	WrapCRDs bool
-	// WrapCRDsCondition is the condition used to wrap the Custom Resource Definitions
-	WrapCRDsCondition string
+	// OptionalCRDs - Enable optional CRD installation through values.
+	OptionalCRDs bool
 }
 
 func (c *Config) Validate() error {

pkg/processor/crd/crd.go

@@ -35,6 +35,8 @@ status:
   conditions: []
   storedVersions: []`
 
+const optionalCRDsConditional = "crds.enabled"
+
 var crdGVC = schema.GroupVersionKind{
 	Group:   "apiextensions.k8s.io",
 	Version: "v1",
@@ -132,12 +134,10 @@ func (c crd) Process(appMeta helmify.AppMetadata, obj *unstructured.Unstructured
 
 	values := helmify.Values{}
 
-	if appMeta.Config().WrapCRDs {
-
-		cond := appMeta.Config().WrapCRDsCondition
-		res = fmt.Sprintf("{{- if .Values.%s }}\n%s\n{{- end }}", cond, res)
-		_, _ = values.Add(true, strings.Split(appMeta.Config().WrapCRDsCondition, ".")...)
-		logrus.WithField("crd", name).WithField("condition", cond).Info("wrapping CRDs in conditional")
+	if appMeta.Config().OptionalCRDs {
+		res = fmt.Sprintf("{{- if .Values.%s }}\n%s\n{{- end }}", optionalCRDsConditional, res)
+		_, _ = values.Add(true, strings.Split(optionalCRDsConditional, ".")...)
+		logrus.WithField("crd", name).WithField("condition", optionalCRDsConditional).Debug("enabling optional CRD installation")
 	}
 
 	return true, &result{

pkg/processor/crd/crd_test.go

@@ -51,27 +51,21 @@ func Test_crd_Process(t *testing.T) {
 	t.Run("wrapped with condition", func(t *testing.T) {
 		obj := internal.GenerateObj(strCRD)
 
-		conditions := []string{"crds.create", "crds.enabled", "installCRDs"}
-
-		for _, cond := range conditions {
-			t.Run(cond, func(t *testing.T) {
-				meta := metadata.New(config.Config{WrapCRDs: true, WrapCRDsCondition: cond})
-				processed, tmpl, err := testInstance.Process(meta, obj)
-				assert.NoError(t, err)
-				assert.True(t, processed)
-				assert.NotNil(t, tmpl)
+		meta := metadata.New(config.Config{OptionalCRDs: true})
+		processed, tmpl, err := testInstance.Process(meta, obj)
+		assert.NoError(t, err)
+		assert.True(t, processed)
+		assert.NotNil(t, tmpl)
 
-				data := string(tmpl.(*result).data)
+		data := string(tmpl.(*result).data)
 
-				assert.Contains(t, data, "{{- if .Values."+cond+" }}", "template should start with conditional")
-				assert.Contains(t, data, "{{- end }}", "template should end with conditional")
+		assert.Contains(t, data, "{{- if .Values."+optionalCRDsConditional+" }}", "template should start with conditional")
+		assert.Contains(t, data, "{{- end }}", "template should end with conditional")
 
-				values := tmpl.(*result).values
-				val, ok := getValue(values, cond)
-				assert.True(t, ok, "expected key crds."+cond+" in values")
-				assert.Equal(t, true, val)
-			})
-		}
+		values := tmpl.(*result).values
+		val, ok := getValue(values, optionalCRDsConditional)
+		assert.True(t, ok, "expected key crds."+optionalCRDsConditional+" in values")
+		assert.Equal(t, true, val)
 	})
 }