Check enablement from values part as well

Author: richardwxn

pkg/name/name.go

@@ -56,6 +56,8 @@ const (
 	// Operator components
 	IstioOperatorComponentName      ComponentName = "IstioOperator"
 	IstioOperatorCustomResourceName ComponentName = "IstioOperatorCustomResource"
+
+
 )
 
 var (
@@ -72,6 +74,21 @@ var (
 		CNIComponentName,
 	}
 	allComponentNamesMap = make(map[ComponentName]bool)
+	// TODO: merge this with the componentMaps defined in translateConfig
+	// ComponentNameToHelmComponentPath defines mapping from component name to helm component root path.
+	ComponentNameToHelmComponentPath = map[ComponentName]string {
+		PilotComponentName:           "pilot",
+		GalleyComponentName:          "galley",
+		SidecarInjectorComponentName: "sidecarInjectorWebhook",
+		PolicyComponentName:          "mixer.policy",
+		TelemetryComponentName:       "mixer.telemetry",
+		CitadelComponentName:         "security",
+		CertManagerComponentName:     "certmanager",
+		NodeAgentComponentName:       "nodeagent",
+		IngressComponentName:         "gateways.istio-ingressgateway",
+		EgressComponentName:          "gateways.istio-egressgateway",
+		CNIComponentName:             "cni",
+	}
 )
 
 func init() {
@@ -100,7 +117,14 @@ func (cn ComponentName) IsAddon() bool {
 
 // IsComponentEnabledInSpec reports whether the given component is enabled in the given spec.
 // IsComponentEnabledInSpec assumes that controlPlaneSpec has been validated.
+// TODO: remove extra validations when comfort level is high enough.
 func IsComponentEnabledInSpec(componentName ComponentName, controlPlaneSpec *v1alpha1.IstioOperatorSpec) (bool, error) {
+	// if component enablement path is defined and found in Values part, return it first, otherwise check from ISCP.
+	valuePath := ComponentNameToHelmComponentPath[componentName]
+	enabled, pathExist, err := IsComponentEnabledFromValue(valuePath, controlPlaneSpec.Values)
+	if err == nil && pathExist {
+		return enabled, nil
+	}
 	if componentName == IngressComponentName {
 		return len(controlPlaneSpec.Components.IngressGateways) != 0, nil
 	}
@@ -128,25 +152,28 @@ func IsComponentEnabledInSpec(componentName ComponentName, controlPlaneSpec *v1a
 
 // IsComponentEnabledFromValue get whether component is enabled in helm value.yaml tree.
 // valuePath points to component path in the values tree.
-func IsComponentEnabledFromValue(valuePath string, valueSpec map[string]interface{}) (bool, error) {
+func IsComponentEnabledFromValue(valuePath string, valueSpec map[string]interface{}) (enabled bool, pathExist bool, err error) {
 	enabledPath := valuePath + ".enabled"
 	enableNodeI, found, err := tpath.GetFromTreePath(valueSpec, util.ToYAMLPath(enabledPath))
 	if err != nil {
-		return false, fmt.Errorf("error finding component enablement path: %s in helm value.yaml tree", enabledPath)
+		return false, false, fmt.Errorf("error finding component enablement path: %s in helm value.yaml tree", enabledPath)
 	}
 	if !found {
 		// Some components do not specify enablement should be treated as enabled if the root node in the component subtree exists.
 		_, found, err := tpath.GetFromTreePath(valueSpec, util.ToYAMLPath(valuePath))
-		if found && err == nil {
-			return true, nil
+		if err != nil {
+			return false, false, err
 		}
-		return false, nil
+		if found {
+			return true, true, nil
+		}
+		return false, false, nil
 	}
 	enableNode, ok := enableNodeI.(bool)
 	if !ok {
-		return false, fmt.Errorf("node at valuePath %s has bad type %T, expect bool", enabledPath, enableNodeI)
+		return false, true, fmt.Errorf("node at valuePath %s has bad type %T, expect bool", enabledPath, enableNodeI)
 	}
-	return enableNode, nil
+	return enableNode, true, nil
 }
 
 // NamespaceFromValue gets the namespace value in helm value.yaml tree.