Skip to content

Commit

Permalink
Error message if istioctl version doesn't match data plane version (i…
Browse files Browse the repository at this point in the history
…stio#11592)

* Additional error text if istioctl version doesn't match data plane version

* Fix typo

* Revise wording of error msg
  • Loading branch information
esnible authored and louiscryan committed Feb 14, 2019
1 parent c536292 commit 449ced1
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion istioctl/cmd/istioctl/kubeinject.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,12 @@ func getMeshConfigFromConfigMap(kubeconfig string) (*meshconfig.MeshConfig, erro
if !exists {
return nil, fmt.Errorf("missing configuration map key %q", configMapKey)
}
return model.ApplyMeshConfigDefaults(configYaml)
cfg, err := model.ApplyMeshConfigDefaults(configYaml)
if err != nil {
err = multierr.Append(fmt.Errorf("istioctl version %s cannot parse mesh config. Install istioctl from the latest Istio release",
version.Info.Version), err)
}
return cfg, err
}

func getInjectConfigFromConfigMap(kubeconfig string) (string, error) {
Expand Down

0 comments on commit 449ced1

Please sign in to comment.