Skip to content

Commit 1ab7536

Browse files
Merge pull request #126308 from cici37/hotFix
Update with stdlib errors Kubernetes-commit: 49ff25507455cae99cb1b681a278db617ac979c1
2 parents 4940c42 + 93b42bf commit 1ab7536

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ require (
1212
github.com/google/go-cmp v0.6.0
1313
github.com/google/gofuzz v1.2.0
1414
github.com/google/uuid v1.6.0
15-
github.com/pkg/errors v0.9.1
1615
github.com/spf13/cobra v1.8.1
1716
github.com/spf13/pflag v1.0.5
1817
github.com/stretchr/testify v1.9.0
@@ -78,6 +77,7 @@ require (
7877
github.com/modern-go/reflect2 v1.0.2 // indirect
7978
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
8079
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
80+
github.com/pkg/errors v0.9.1 // indirect
8181
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
8282
github.com/prometheus/client_golang v1.19.1 // indirect
8383
github.com/prometheus/client_model v0.6.1 // indirect

pkg/apiserver/schema/cel/compilation.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ limitations under the License.
1717
package cel
1818

1919
import (
20+
"errors"
2021
"fmt"
2122
"strings"
2223
"time"
2324

2425
"github.com/google/cel-go/cel"
2526
"github.com/google/cel-go/checker"
2627
"github.com/google/cel-go/common/types"
27-
"github.com/pkg/errors"
2828

2929
apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
3030
"k8s.io/apiextensions-apiserver/pkg/apiserver/schema"
@@ -127,7 +127,7 @@ func Compile(s *schema.Structural, declType *apiservercel.DeclType, perCallLimit
127127
return nil, nil
128128
}
129129
if declType == nil {
130-
return nil, errors.New("Failed to convert to declType for CEL validation rules")
130+
return nil, errors.New("failed to convert to declType for CEL validation rules")
131131
}
132132
celRules := s.XValidations
133133

0 commit comments

Comments
 (0)