Merge branch 'main' into token-endpoint

.golangci.yaml

@@ -30,7 +30,6 @@ linters:
   - gocritic
   - gocyclo
   - godot
-  - goerr113
   - goheader
   - goimports
   - golint
@@ -56,7 +55,6 @@ issues:
     linters:
     - funlen
     - gochecknoglobals
-    - goerr113
 
 linters-settings:
   funlen:

internal/controllerlib/option.go

@@ -91,13 +91,11 @@ func WithInformer(getter InformerGetter, filter Filter, opt InformerOption) Opti
 				if err != nil {
 					tombstone, ok := obj.(cache.DeletedFinalStateUnknown)
 					if !ok {
-						//nolint: goerr113
 						utilruntime.HandleError(fmt.Errorf("%s: could not get object from tombstone: %+v", c.Name(), obj))
 						return
 					}
 					accessor, err = meta.Accessor(tombstone.Obj)
 					if err != nil {
-						//nolint: goerr113
 						utilruntime.HandleError(fmt.Errorf("%s: tombstone contained object that is not an accessor: %+v", c.Name(), obj))
 						return
 					}

internal/controllerlib/test/integration/examplecontroller/controller/creating.go

@@ -93,7 +93,6 @@ func NewExampleCreatingController(
 			}
 
 			if actualSecret.Annotations[api.ServiceUIDAnnotation] != string(service.UID) {
-				//nolint: goerr113
 				utilruntime.HandleError(fmt.Errorf("secret %s/%s does not have corresponding service UID %v", actualSecret.Namespace, actualSecret.Name, service.UID))
 				return nil // drop from queue because we cannot safely update this secret
 			}

internal/controllerlib/test/integration/examplecontroller/controller/updating.go

@@ -105,7 +105,6 @@ func NewExampleUpdatingController(
 		}
 
 		if !isSecretValidForService(service, secret) {
-			//nolint: goerr113
 			utilruntime.HandleError(fmt.Errorf("secret %s/%s does not have corresponding service UID %v", secret.Namespace, secret.Name, service.UID))
 			return nil
 		}