Skip to content

Commit

Permalink
Merge pull request #114861 from jpbetz/release-1.26
Browse files Browse the repository at this point in the history
Cherry pick 114857 to release-1.26

Kubernetes-commit: e2093f873689c8ff3bd90042dd533cb6a1e0cd1c
  • Loading branch information
k8s-publishing-bot committed Jan 12, 2023
2 parents 7b39ac1 + 51e677b commit 81b63bf
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ require (
github.com/evanphx/json-patch v4.12.0+incompatible
github.com/fsnotify/fsnotify v1.6.0
github.com/gogo/protobuf v1.3.2
github.com/google/cel-go v0.12.5
github.com/google/cel-go v0.12.6
github.com/google/gnostic v0.5.7-v3refs
github.com/google/go-cmp v0.5.9
github.com/google/gofuzz v1.1.0
Expand Down Expand Up @@ -43,7 +43,7 @@ require (
gopkg.in/natefinch/lumberjack.v2 v2.0.0
gopkg.in/square/go-jose.v2 v2.2.2
k8s.io/api v0.0.0-20221227185931-07a9cbc7b3b1
k8s.io/apimachinery v0.0.0-20221208055745-5d4cdd22b0f7
k8s.io/apimachinery v0.0.0-20230111232008-373a5f752d44
k8s.io/client-go v0.0.0-20221227214233-0c34939c9bcb
k8s.io/component-base v0.0.0-20230110174730-0b623d3c56e9
k8s.io/klog/v2 v2.80.1
Expand Down Expand Up @@ -123,7 +123,7 @@ require (

replace (
k8s.io/api => k8s.io/api v0.0.0-20221227185931-07a9cbc7b3b1
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20221208055745-5d4cdd22b0f7
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230111232008-373a5f752d44
k8s.io/client-go => k8s.io/client-go v0.0.0-20221227214233-0c34939c9bcb
k8s.io/component-base => k8s.io/component-base v0.0.0-20230110174730-0b623d3c56e9
k8s.io/kms => k8s.io/kms v0.0.0-20221208063806-3bf04e13ad9a
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -222,8 +222,8 @@ github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Z
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4=
github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA=
github.com/google/cel-go v0.12.5 h1:DmzaiSgoaqGCjtpPQWl26/gND+yRpim56H1jCVev6d8=
github.com/google/cel-go v0.12.5/go.mod h1:Jk7ljRzLBhkmiAwBoUxB1sZSCVBAzkqPF25olK/iRDw=
github.com/google/cel-go v0.12.6 h1:kjeKudqV0OygrAqA9fX6J55S8gj+Jre2tckIm5RoG4M=
github.com/google/cel-go v0.12.6/go.mod h1:Jk7ljRzLBhkmiAwBoUxB1sZSCVBAzkqPF25olK/iRDw=
github.com/google/gnostic v0.5.7-v3refs h1:FhTMOKj2VhjpouxvWJAV1TL304uMlb9zcDqkl6cEI54=
github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ=
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
Expand Down Expand Up @@ -988,8 +988,8 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20221227185931-07a9cbc7b3b1 h1:YJxja/EAJoBLVlXPjUEyaO32DsjAcqjY7DEVfZtEq78=
k8s.io/api v0.0.0-20221227185931-07a9cbc7b3b1/go.mod h1:GetGjgKCUeHLs1GMrltnUDUYPvhhro0e4BozgWsM0Jk=
k8s.io/apimachinery v0.0.0-20221208055745-5d4cdd22b0f7 h1:6WftyyXbOkaz1aO+YA8Z5774ZvYeQOUk1JUkvPaOTvE=
k8s.io/apimachinery v0.0.0-20221208055745-5d4cdd22b0f7/go.mod h1:tnPmbONNJ7ByJNz9+n9kMjNP8ON+1qoAIIC70lztu74=
k8s.io/apimachinery v0.0.0-20230111232008-373a5f752d44 h1:w9HNLfeng207Q9+Nmw2iGWlp6vfNVc5E4sjfHRxV4sY=
k8s.io/apimachinery v0.0.0-20230111232008-373a5f752d44/go.mod h1:tnPmbONNJ7ByJNz9+n9kMjNP8ON+1qoAIIC70lztu74=
k8s.io/client-go v0.0.0-20221227214233-0c34939c9bcb h1:4GM41f+eXZ0ccGX5wMjQ9WfPQzVvBUbJ4DZrkBWQXpg=
k8s.io/client-go v0.0.0-20221227214233-0c34939c9bcb/go.mod h1:vWaQHXAqLmjyGsp6Ltc1esfPRYDev/ZLPiGkqPFqWzs=
k8s.io/component-base v0.0.0-20230110174730-0b623d3c56e9 h1:u7WBaykxKJyiCci5iITB6fVIuT5azqn5B+Q+3blJLzU=
Expand Down

0 comments on commit 81b63bf

Please sign in to comment.