github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-17 07:03:31 +00:00
Code Issues Projects Releases Wiki Activity

alias local packagename for pkg/util/errors

Browse Source
This commit is contained in:
eulerzgy
2015-10-14 13:18:37 +08:00
parent 0338e0ef53
commit f8f9afb874
29 changed files with 83 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugin/pkg/admission/limitranger/admission.go
View File

@@ -31,7 +31,7 @@ import (
"k8s.io/kubernetes/pkg/fields"
"k8s.io/kubernetes/pkg/labels"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util/errors"
utilerrors "k8s.io/kubernetes/pkg/util/errors"
"k8s.io/kubernetes/pkg/watch"
)
@@ -395,5 +395,5 @@ func PodLimitFunc(limitRange *api.LimitRange, pod *api.Pod) error {
}
}
}
return errors.NewAggregate(errs)
return utilerrors.NewAggregate(errs)
}

4
plugin/pkg/admission/resourcequota/admission.go
View File

@@ -31,7 +31,7 @@ import (
"k8s.io/kubernetes/pkg/fields"
"k8s.io/kubernetes/pkg/labels"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util/errors"
utilerrors "k8s.io/kubernetes/pkg/util/errors"
"k8s.io/kubernetes/pkg/watch"
)
@@ -261,5 +261,5 @@ func IncrementUsage(a admission.Attributes, status *api.ResourceQuotaStatus, cli
}
}
return dirty, errors.NewAggregate(errs)
return dirty, utilerrors.NewAggregate(errs)
}

4
plugin/pkg/auth/authenticator/request/union/union.go
View File

@@ -21,7 +21,7 @@ import (
"k8s.io/kubernetes/pkg/auth/authenticator"
"k8s.io/kubernetes/pkg/auth/user"
"k8s.io/kubernetes/pkg/util/errors"
utilerrors "k8s.io/kubernetes/pkg/util/errors"
)
// unionAuthRequestHandler authenticates requests using a chain of authenticator.Requests
@@ -48,5 +48,5 @@ func (authHandler unionAuthRequestHandler) AuthenticateRequest(req *http.Request
}
}
return nil, false, errors.NewAggregate(errlist)
return nil, false, utilerrors.NewAggregate(errlist)
}

4
plugin/pkg/auth/authenticator/request/x509/x509.go
View File

@@ -21,7 +21,7 @@ import (
"net/http"
"k8s.io/kubernetes/pkg/auth/user"
"k8s.io/kubernetes/pkg/util/errors"
utilerrors "k8s.io/kubernetes/pkg/util/errors"
)
// UserConversion defines an interface for extracting user info from a client certificate chain
@@ -75,7 +75,7 @@ func (a *Authenticator) AuthenticateRequest(req *http.Request) (user.Info, bool,
}
}
}
return nil, false, errors.NewAggregate(errlist)
return nil, false, utilerrors.NewAggregate(errlist)
}
// DefaultVerifyOptions returns VerifyOptions that use the system root certificates, current time,

4
plugin/pkg/scheduler/api/validation/validation.go
View File

@@ -19,7 +19,7 @@ package validation
import (
"fmt"
"k8s.io/kubernetes/pkg/util/errors"
utilerrors "k8s.io/kubernetes/pkg/util/errors"
schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api"
)
@@ -34,5 +34,5 @@ func ValidatePolicy(policy schedulerapi.Policy) error {
}
}
return errors.NewAggregate(validationErrors)
return utilerrors.NewAggregate(validationErrors)
}