Skip to content

Commit 4158e7c

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#85123 from danielqsj/apierrs
Unify aliases for "k8s.io/apimachinery/pkg/api/errors"
2 parents 1313385 + 6596a14 commit 4158e7c

File tree

115 files changed

+447
-450
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+447
-450
lines changed

‎pkg/controller/certificates/rootcacertpublisher/publisher.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"time"
2323

2424
v1 "k8s.io/api/core/v1"
25-
apierrs "k8s.io/apimachinery/pkg/api/errors"
25+
apierrors "k8s.io/apimachinery/pkg/api/errors"
2626
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2727
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
2828
"k8s.io/apimachinery/pkg/util/wait"
@@ -177,7 +177,7 @@ func (c *Publisher) syncNamespace(ns string) error {
177177

178178
cm, err := c.cmLister.ConfigMaps(ns).Get(RootCACertConfigMapName)
179179
switch {
180-
case apierrs.IsNotFound(err):
180+
case apierrors.IsNotFound(err):
181181
_, err := c.client.CoreV1().ConfigMaps(ns).Create(&v1.ConfigMap{
182182
ObjectMeta: metav1.ObjectMeta{
183183
Name: RootCACertConfigMapName,

‎pkg/controller/serviceaccount/serviceaccounts_controller.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"time"
2222

2323
"k8s.io/api/core/v1"
24-
apierrs "k8s.io/apimachinery/pkg/api/errors"
24+
apierrors "k8s.io/apimachinery/pkg/api/errors"
2525
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2626
utilerrors "k8s.io/apimachinery/pkg/util/errors"
2727
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
@@ -188,7 +188,7 @@ func (c *ServiceAccountsController) syncNamespace(key string) error {
188188
}()
189189

190190
ns, err := c.nsLister.Get(key)
191-
if apierrs.IsNotFound(err) {
191+
if apierrors.IsNotFound(err) {
192192
return nil
193193
}
194194
if err != nil {
@@ -204,17 +204,17 @@ func (c *ServiceAccountsController) syncNamespace(key string) error {
204204
switch _, err := c.saLister.ServiceAccounts(ns.Name).Get(sa.Name); {
205205
case err == nil:
206206
continue
207-
case apierrs.IsNotFound(err):
207+
case apierrors.IsNotFound(err):
208208
case err != nil:
209209
return err
210210
}
211211
// this is only safe because we never read it and we always write it
212212
// TODO eliminate this once the fake client can handle creation without NS
213213
sa.Namespace = ns.Name
214214

215-
if _, err := c.client.CoreV1().ServiceAccounts(ns.Name).Create(&sa); err != nil && !apierrs.IsAlreadyExists(err) {
215+
if _, err := c.client.CoreV1().ServiceAccounts(ns.Name).Create(&sa); err != nil && !apierrors.IsAlreadyExists(err) {
216216
// we can safely ignore terminating namespace errors
217-
if !apierrs.HasStatusCause(err, v1.NamespaceTerminatingCause) {
217+
if !apierrors.HasStatusCause(err, v1.NamespaceTerminatingCause) {
218218
createFailures = append(createFailures, err)
219219
}
220220
}

‎pkg/controller/volume/persistentvolume/provision_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222

2323
v1 "k8s.io/api/core/v1"
2424
storage "k8s.io/api/storage/v1"
25-
apierrs "k8s.io/apimachinery/pkg/api/errors"
25+
apierrors "k8s.io/apimachinery/pkg/api/errors"
2626
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2727
corelisters "k8s.io/client-go/listers/core/v1"
2828
"k8s.io/client-go/tools/cache"
@@ -423,7 +423,7 @@ func TestProvisionSync(t *testing.T) {
423423
// Inject errors to simulate crashed API server during
424424
// kubeclient.PersistentVolumes.Create()
425425
{Verb: "create", Resource: "persistentvolumes", Error: errors.New("Mock creation error1")},
426-
{Verb: "create", Resource: "persistentvolumes", Error: apierrs.NewAlreadyExists(api.Resource("persistentvolumes"), "")},
426+
{Verb: "create", Resource: "persistentvolumes", Error: apierrors.NewAlreadyExists(api.Resource("persistentvolumes"), "")},
427427
},
428428
wrapTestWithPluginCalls(
429429
nil, // recycle calls

‎pkg/controller/volume/persistentvolume/pv_controller.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424

2525
v1 "k8s.io/api/core/v1"
2626
storage "k8s.io/api/storage/v1"
27-
apierrs "k8s.io/apimachinery/pkg/api/errors"
27+
apierrors "k8s.io/apimachinery/pkg/api/errors"
2828
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2929
"k8s.io/apimachinery/pkg/labels"
3030
"k8s.io/apimachinery/pkg/util/sets"
@@ -534,16 +534,16 @@ func (ctrl *PersistentVolumeController) syncVolume(volume *v1.PersistentVolume)
534534
// updated to Released state when PVC does not exist.
535535
if volume.Status.Phase != v1.VolumeReleased && volume.Status.Phase != v1.VolumeFailed {
536536
obj, err = ctrl.claimLister.PersistentVolumeClaims(volume.Spec.ClaimRef.Namespace).Get(volume.Spec.ClaimRef.Name)
537-
if err != nil && !apierrs.IsNotFound(err) {
537+
if err != nil && !apierrors.IsNotFound(err) {
538538
return err
539539
}
540-
found = !apierrs.IsNotFound(err)
540+
found = !apierrors.IsNotFound(err)
541541
if !found {
542542
obj, err = ctrl.kubeClient.CoreV1().PersistentVolumeClaims(volume.Spec.ClaimRef.Namespace).Get(volume.Spec.ClaimRef.Name, metav1.GetOptions{})
543-
if err != nil && !apierrs.IsNotFound(err) {
543+
if err != nil && !apierrors.IsNotFound(err) {
544544
return err
545545
}
546-
found = !apierrs.IsNotFound(err)
546+
found = !apierrors.IsNotFound(err)
547547
}
548548
}
549549
}
@@ -1391,7 +1391,7 @@ func (ctrl *PersistentVolumeController) provisionClaimOperation(
13911391

13921392
pvName := ctrl.getProvisionedVolumeNameForClaim(claim)
13931393
volume, err := ctrl.kubeClient.CoreV1().PersistentVolumes().Get(pvName, metav1.GetOptions{})
1394-
if err != nil && !apierrs.IsNotFound(err) {
1394+
if err != nil && !apierrors.IsNotFound(err) {
13951395
klog.V(3).Infof("error reading persistent volume %q: %v", pvName, err)
13961396
return pluginName, err
13971397
}
@@ -1489,7 +1489,7 @@ func (ctrl *PersistentVolumeController) provisionClaimOperation(
14891489
for i := 0; i < ctrl.createProvisionedPVRetryCount; i++ {
14901490
klog.V(4).Infof("provisionClaimOperation [%s]: trying to save volume %s", claimToClaimKey(claim), volume.Name)
14911491
var newVol *v1.PersistentVolume
1492-
if newVol, err = ctrl.kubeClient.CoreV1().PersistentVolumes().Create(volume); err == nil || apierrs.IsAlreadyExists(err) {
1492+
if newVol, err = ctrl.kubeClient.CoreV1().PersistentVolumes().Create(volume); err == nil || apierrors.IsAlreadyExists(err) {
14931493
// Save succeeded.
14941494
if err != nil {
14951495
klog.V(3).Infof("volume %q for claim %q already exists, reusing", volume.Name, claimToClaimKey(claim))

‎pkg/controller/volume/persistentvolume/testing/testing.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"sync"
2525

2626
v1 "k8s.io/api/core/v1"
27-
apierrs "k8s.io/apimachinery/pkg/api/errors"
27+
apierrors "k8s.io/apimachinery/pkg/api/errors"
2828
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2929
"k8s.io/apimachinery/pkg/runtime"
3030
"k8s.io/apimachinery/pkg/runtime/schema"
@@ -223,7 +223,7 @@ func (r *VolumeReactor) React(action core.Action) (handled bool, ret runtime.Obj
223223
return true, volume.DeepCopy(), nil
224224
}
225225
klog.V(4).Infof("GetVolume: volume %s not found", name)
226-
return true, nil, apierrs.NewNotFound(action.GetResource().GroupResource(), name)
226+
return true, nil, apierrors.NewNotFound(action.GetResource().GroupResource(), name)
227227

228228
case action.Matches("get", "persistentvolumeclaims"):
229229
name := action.(core.GetAction).GetName()
@@ -233,7 +233,7 @@ func (r *VolumeReactor) React(action core.Action) (handled bool, ret runtime.Obj
233233
return true, claim.DeepCopy(), nil
234234
}
235235
klog.V(4).Infof("GetClaim: claim %s not found", name)
236-
return true, nil, apierrs.NewNotFound(action.GetResource().GroupResource(), name)
236+
return true, nil, apierrors.NewNotFound(action.GetResource().GroupResource(), name)
237237

238238
case action.Matches("delete", "persistentvolumes"):
239239
name := action.(core.DeleteAction).GetName()

‎pkg/controller/volume/pvcprotection/pvc_protection_controller.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"time"
2222

2323
v1 "k8s.io/api/core/v1"
24-
apierrs "k8s.io/apimachinery/pkg/api/errors"
24+
apierrors "k8s.io/apimachinery/pkg/api/errors"
2525
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2626
"k8s.io/apimachinery/pkg/labels"
2727
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
@@ -150,7 +150,7 @@ func (c *Controller) processPVC(pvcNamespace, pvcName string) error {
150150
}()
151151

152152
pvc, err := c.pvcLister.PersistentVolumeClaims(pvcNamespace).Get(pvcName)
153-
if apierrs.IsNotFound(err) {
153+
if apierrors.IsNotFound(err) {
154154
klog.V(4).Infof("PVC %s/%s not found, ignoring", pvcNamespace, pvcName)
155155
return nil
156156
}

‎pkg/controller/volume/pvprotection/pv_protection_controller.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"time"
2222

2323
"k8s.io/api/core/v1"
24-
apierrs "k8s.io/apimachinery/pkg/api/errors"
24+
apierrors "k8s.io/apimachinery/pkg/api/errors"
2525
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
2626
"k8s.io/apimachinery/pkg/util/wait"
2727
coreinformers "k8s.io/client-go/informers/core/v1"
@@ -127,7 +127,7 @@ func (c *Controller) processPV(pvName string) error {
127127
}()
128128

129129
pv, err := c.pvLister.Get(pvName)
130-
if apierrs.IsNotFound(err) {
130+
if apierrors.IsNotFound(err) {
131131
klog.V(4).Infof("PV %s not found, ignoring", pvName)
132132
return nil
133133
}

‎pkg/registry/authorization/localsubjectaccessreview/rest.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"context"
2121
"fmt"
2222

23-
kapierrors "k8s.io/apimachinery/pkg/api/errors"
23+
apierrors "k8s.io/apimachinery/pkg/api/errors"
2424
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2525
"k8s.io/apimachinery/pkg/runtime"
2626
"k8s.io/apiserver/pkg/authorization/authorizer"
@@ -50,17 +50,17 @@ func (r *REST) New() runtime.Object {
5050
func (r *REST) Create(ctx context.Context, obj runtime.Object, createValidation rest.ValidateObjectFunc, options *metav1.CreateOptions) (runtime.Object, error) {
5151
localSubjectAccessReview, ok := obj.(*authorizationapi.LocalSubjectAccessReview)
5252
if !ok {
53-
return nil, kapierrors.NewBadRequest(fmt.Sprintf("not a LocaLocalSubjectAccessReview: %#v", obj))
53+
return nil, apierrors.NewBadRequest(fmt.Sprintf("not a LocaLocalSubjectAccessReview: %#v", obj))
5454
}
5555
if errs := authorizationvalidation.ValidateLocalSubjectAccessReview(localSubjectAccessReview); len(errs) > 0 {
56-
return nil, kapierrors.NewInvalid(authorizationapi.Kind(localSubjectAccessReview.Kind), "", errs)
56+
return nil, apierrors.NewInvalid(authorizationapi.Kind(localSubjectAccessReview.Kind), "", errs)
5757
}
5858
namespace := genericapirequest.NamespaceValue(ctx)
5959
if len(namespace) == 0 {
60-
return nil, kapierrors.NewBadRequest(fmt.Sprintf("namespace is required on this type: %v", namespace))
60+
return nil, apierrors.NewBadRequest(fmt.Sprintf("namespace is required on this type: %v", namespace))
6161
}
6262
if namespace != localSubjectAccessReview.Namespace {
63-
return nil, kapierrors.NewBadRequest(fmt.Sprintf("spec.resourceAttributes.namespace must match namespace: %v", namespace))
63+
return nil, apierrors.NewBadRequest(fmt.Sprintf("spec.resourceAttributes.namespace must match namespace: %v", namespace))
6464
}
6565

6666
if createValidation != nil {

‎pkg/registry/authorization/subjectaccessreview/rest.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"context"
2121
"fmt"
2222

23-
kapierrors "k8s.io/apimachinery/pkg/api/errors"
23+
apierrors "k8s.io/apimachinery/pkg/api/errors"
2424
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2525
"k8s.io/apimachinery/pkg/runtime"
2626
"k8s.io/apiserver/pkg/authorization/authorizer"
@@ -49,10 +49,10 @@ func (r *REST) New() runtime.Object {
4949
func (r *REST) Create(ctx context.Context, obj runtime.Object, createValidation rest.ValidateObjectFunc, options *metav1.CreateOptions) (runtime.Object, error) {
5050
subjectAccessReview, ok := obj.(*authorizationapi.SubjectAccessReview)
5151
if !ok {
52-
return nil, kapierrors.NewBadRequest(fmt.Sprintf("not a SubjectAccessReview: %#v", obj))
52+
return nil, apierrors.NewBadRequest(fmt.Sprintf("not a SubjectAccessReview: %#v", obj))
5353
}
5454
if errs := authorizationvalidation.ValidateSubjectAccessReview(subjectAccessReview); len(errs) > 0 {
55-
return nil, kapierrors.NewInvalid(authorizationapi.Kind(subjectAccessReview.Kind), "", errs)
55+
return nil, apierrors.NewInvalid(authorizationapi.Kind(subjectAccessReview.Kind), "", errs)
5656
}
5757

5858
if createValidation != nil {

‎pkg/registry/core/service/allocator/storage/storage.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"fmt"
2323
"sync"
2424

25-
k8serr "k8s.io/apimachinery/pkg/api/errors"
25+
apierrors "k8s.io/apimachinery/pkg/api/errors"
2626
"k8s.io/apimachinery/pkg/runtime"
2727
"k8s.io/apimachinery/pkg/runtime/schema"
2828
"k8s.io/apiserver/pkg/registry/generic"
@@ -209,10 +209,10 @@ func (e *Etcd) CreateOrUpdate(snapshot *api.RangeAllocation) error {
209209
switch {
210210
case len(snapshot.ResourceVersion) != 0 && len(existing.ResourceVersion) != 0:
211211
if snapshot.ResourceVersion != existing.ResourceVersion {
212-
return nil, k8serr.NewConflict(e.resource, "", fmt.Errorf("the provided resource version does not match"))
212+
return nil, apierrors.NewConflict(e.resource, "", fmt.Errorf("the provided resource version does not match"))
213213
}
214214
case len(existing.ResourceVersion) != 0:
215-
return nil, k8serr.NewConflict(e.resource, "", fmt.Errorf("another caller has already initialized the resource"))
215+
return nil, apierrors.NewConflict(e.resource, "", fmt.Errorf("another caller has already initialized the resource"))
216216
}
217217
last = snapshot.ResourceVersion
218218
return snapshot, nil

0 commit comments

Comments
 (0)