Skip to content

Commit

Permalink
Merge branch 'v2' of github.com:nerdalize/nerd into v2
Browse files Browse the repository at this point in the history
  • Loading branch information
advdv committed Mar 6, 2018
2 parents da5a2d6 + 224db0b commit 0f61ae4
Show file tree
Hide file tree
Showing 27 changed files with 77 additions and 29 deletions.
4 changes: 3 additions & 1 deletion cmd/dataset_download.go
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,9 @@ func (cmd *DatasetDownload) Execute(args []string) (err error) {
return errors.Wrap(err, "failed to download dataset")
}
}
if len(datasets) > 1 {
if len(datasets) == 0 {
cmd.out.Infof("No dataset found, maybe your job is not using any datasets? You can check with `nerd job list` the state of your job.")
} else if len(datasets) > 1 {
cmd.out.Infof("Downloaded %d datasets in %s", len(datasets), outputDir)
} else {
cmd.out.Infof("Downloaded %d dataset in %s", len(datasets), outputDir)
Expand Down
2 changes: 1 addition & 1 deletion cmd/errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ func renderServiceError(err error, format string, args ...interface{}) error {
case kubevisor.IsKubernetesErr(err):
return errors.Errorf("%s: cluster failed to perform action: %v", fmt.Errorf(format, args...), err)
case kubevisor.IsAlreadyExistsErr(err):
return errors.Errorf("%s: it already exists", fmt.Errorf(format, args...))
return errors.Errorf("%s: this name is already in use", fmt.Errorf(format, args...))
case kubevisor.IsNamespaceNotExistsErr(err):
return errors.Errorf("%s: the namespace does not exist or you have no access. If the problem persists, please contact mayday@nerdalize.com.", fmt.Errorf(format, args...))
case kubevisor.IsServiceUnavailableErr(err):
Expand Down
8 changes: 3 additions & 5 deletions crd/pkg/apis/stable.nerdalize.com/v1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions crd/pkg/client/clientset/versioned/clientset.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions crd/pkg/client/clientset/versioned/doc.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 12 additions & 1 deletion crd/pkg/client/clientset/versioned/fake/clientset_generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions crd/pkg/client/clientset/versioned/fake/doc.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions crd/pkg/client/clientset/versioned/fake/register.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions crd/pkg/client/clientset/versioned/scheme/doc.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions crd/pkg/client/clientset/versioned/scheme/register.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion crd/pkg/client/informers/externalversions/factory.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion crd/pkg/client/informers/externalversions/generic.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion crd/pkg/client/listers/stable.nerdalize.com/v1/dataset.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions glide.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion svc/svc.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ type DI interface {
//ErrMinikubeOnly is returned when a temp di is created on something thats not minikube
var ErrMinikubeOnly = errors.New("temp DI can only be created on Minikube")

//Derived from https://github.com/golang/go/blob/1106512db54fc2736c7a9a67dd553fc9e1fca742/src/path/filepath/path_unix.go#L12
// ValidateAbsPath is derived from https://github.com/golang/go/blob/1106512db54fc2736c7a9a67dd553fc9e1fca742/src/path/filepath/path_unix.go#L12
func ValidateAbsPath(fl validator.FieldLevel) bool {
return strings.HasPrefix(fl.Field().String(), "/")
}
Expand Down

0 comments on commit 0f61ae4

Please sign in to comment.