Skip to content

Commit

Permalink
Merge pull request #126308 from cici37/hotFix
Browse files Browse the repository at this point in the history
Update with stdlib errors

Kubernetes-commit: 49ff25507455cae99cb1b681a278db617ac979c1
  • Loading branch information
k8s-publishing-bot committed Jul 24, 2024
2 parents 4940c42 + 93b42bf commit 1ab7536
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ require (
github.com/google/go-cmp v0.6.0
github.com/google/gofuzz v1.2.0
github.com/google/uuid v1.6.0
github.com/pkg/errors v0.9.1
github.com/spf13/cobra v1.8.1
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.9.0
Expand Down Expand Up @@ -78,6 +77,7 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_golang v1.19.1 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
Expand Down
4 changes: 2 additions & 2 deletions pkg/apiserver/schema/cel/compilation.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ limitations under the License.
package cel

import (
"errors"
"fmt"
"strings"
"time"

"github.com/google/cel-go/cel"
"github.com/google/cel-go/checker"
"github.com/google/cel-go/common/types"
"github.com/pkg/errors"

apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
"k8s.io/apiextensions-apiserver/pkg/apiserver/schema"
Expand Down Expand Up @@ -127,7 +127,7 @@ func Compile(s *schema.Structural, declType *apiservercel.DeclType, perCallLimit
return nil, nil
}
if declType == nil {
return nil, errors.New("Failed to convert to declType for CEL validation rules")
return nil, errors.New("failed to convert to declType for CEL validation rules")
}
celRules := s.XValidations

Expand Down

0 comments on commit 1ab7536

Please sign in to comment.