Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into release-1.27
Browse files Browse the repository at this point in the history
Kubernetes-commit: 0d6e44998fe1c0a21d0aba1327f55d60ae8a7c2d
  • Loading branch information
k8s-publishing-bot committed Mar 27, 2023
1 parent 2c64fa5 commit 1a0fbad
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 11 deletions.
21 changes: 10 additions & 11 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@ require (
google.golang.org/protobuf v1.28.1
gopkg.in/natefinch/lumberjack.v2 v2.0.0
gopkg.in/square/go-jose.v2 v2.6.0
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/client-go v0.0.0
k8s.io/component-base v0.0.0
k8s.io/api v0.0.0-20230327181953-5b93db5944f3
k8s.io/apimachinery v0.0.0-20230315054728-8d1258da8f38
k8s.io/client-go v0.0.0-20230327183152-559da627e81e
k8s.io/component-base v0.0.0-20230327184055-11d07bf76eb4
k8s.io/klog/v2 v2.90.1
k8s.io/kms v0.0.0
k8s.io/kms v0.0.0-20230315071547-f5c193c64781
k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a
k8s.io/utils v0.0.0-20230209194617-a36077c30491
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.1
Expand Down Expand Up @@ -124,10 +124,9 @@ require (
)

replace (
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/apiserver => ../apiserver
k8s.io/client-go => ../client-go
k8s.io/component-base => ../component-base
k8s.io/kms => ../kms
k8s.io/api => k8s.io/api v0.0.0-20230327181953-5b93db5944f3
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230315054728-8d1258da8f38
k8s.io/client-go => k8s.io/client-go v0.0.0-20230327183152-559da627e81e
k8s.io/component-base => k8s.io/component-base v0.0.0-20230327184055-11d07bf76eb4
k8s.io/kms => k8s.io/kms v0.0.0-20230315071547-f5c193c64781
)
10 changes: 10 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -878,8 +878,18 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20230327181953-5b93db5944f3 h1:XvTPeYtRRACrKZGRDkpHMRXq/xT9/cWZPv+Sx7t4HHU=
k8s.io/api v0.0.0-20230327181953-5b93db5944f3/go.mod h1:RAYThv5ELmDNk2Kt+PWiwWtAI1TZyap1JK1QStRzwyw=
k8s.io/apimachinery v0.0.0-20230315054728-8d1258da8f38 h1:n1qDRCTPAXwyXYg7eSpWDO9FdW79lwAQ9dAr1vETpn4=
k8s.io/apimachinery v0.0.0-20230315054728-8d1258da8f38/go.mod h1:5ikh59fK3AJ287GUvpUsryoMFtH9zj/ARfWCo3AyXTM=
k8s.io/client-go v0.0.0-20230327183152-559da627e81e h1:TlvjcU/+pjDx/uP3Dg06MaFcB3MhlBGi6ieut7uAt7E=
k8s.io/client-go v0.0.0-20230327183152-559da627e81e/go.mod h1:E+a5NHIY/xgy5Gv8qVtZIhbNtrYNmezoWCHejv0GBO4=
k8s.io/component-base v0.0.0-20230327184055-11d07bf76eb4 h1:DLLIQIjjTHk3GV7Rlu1PZBxCYb9uCe0yXHf9GdAqscI=
k8s.io/component-base v0.0.0-20230327184055-11d07bf76eb4/go.mod h1:sZCB0ROlbOCEFohUJIR27eMb7zq+eyPcNyRVB0rJcXI=
k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
k8s.io/kms v0.0.0-20230315071547-f5c193c64781 h1:LH9Z43UgXQkuRc1ImiT3F3LoOfj9Xz0r1BP94+uYpys=
k8s.io/kms v0.0.0-20230315071547-f5c193c64781/go.mod h1:9rk1ftD6YM/h1KCjaoIZ8lv1CYvaCcuo57ZIWqiHHGI=
k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a h1:gmovKNur38vgoWfGtP5QOGNOA7ki4n6qNYoFAgMlNvg=
k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a/go.mod h1:y5VtZWM9sHHc2ZodIH/6SHzXj+TPU5USoA8lcIeKEKY=
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
Expand Down

0 comments on commit 1a0fbad

Please sign in to comment.