loose the validation on istioctl to allow users to pass config (istio#5955)

linsun · mandarjog · commit 6f9f420f0c71 · 2018-05-31T13:32:03.000-07:00
* remove the unecessary check
diff --git a/istioctl/cmd/istioctl/inject.go b/istioctl/cmd/istioctl/inject.go
@@ -113,9 +113,7 @@ func validateFlags() error {
 	if meshConfigFile == "" && meshConfigMapName == "" {
 		err = multierr.Append(err, errors.New("--meshConfigFile or --meshConfigMapName must be set"))
 	}
-	if injectConfigFile != "" && injectConfigMapName != "" {
-		err = multierr.Append(err, errors.New("--injectConfigFile and --injectConfigMapName are mutually exclusive"))
-	}
+
 	err = multierr.Append(err, inject.ValidateIncludeIPRanges(includeIPRanges))
 	err = multierr.Append(err, inject.ValidateExcludeIPRanges(excludeIPRanges))
 	err = multierr.Append(err, inject.ValidateIncludeInboundPorts(includeInboundPorts))
