Skip to content

Commit

Permalink
Merge pull request #117708 from Jefftree/automated-cherry-pick-of-#11…
Browse files Browse the repository at this point in the history
…7705-upstream-release-1.27

Automated cherry pick of #117705: Update kube-openapi to fix race

Kubernetes-commit: 7d93cc600f4c6dbd5c0b9e37ae7f351cfc59fde7
  • Loading branch information
k8s-publishing-bot committed May 2, 2023
1 parent 73b9afb commit 1158d6a
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 15 deletions.
29 changes: 14 additions & 15 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ require (
google.golang.org/grpc v1.51.0
google.golang.org/protobuf v1.28.1
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/apiserver v0.0.0
k8s.io/client-go v0.0.0
k8s.io/code-generator v0.0.0
k8s.io/component-base v0.0.0
k8s.io/api v0.0.0-20230424183503-a94d26e5d6b7
k8s.io/apimachinery v0.0.0-20230502173644-b1123d27117a
k8s.io/apiserver v0.0.0-20230502183633-fcfde5264caa
k8s.io/client-go v0.0.0-20230502175410-015caa2eed83
k8s.io/code-generator v0.0.0-20230502173038-1649c2d8b44c
k8s.io/component-base v0.0.0-20230502181637-54279fc3898f
k8s.io/klog/v2 v2.90.1
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f
k8s.io/utils v0.0.0-20230209194617-a36077c30491
Expand Down Expand Up @@ -120,17 +120,16 @@ require (
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
k8s.io/kms v0.0.0 // indirect
k8s.io/kms v0.0.0-20230315071547-f5c193c64781 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.1 // indirect
)

replace (
k8s.io/api => ../api
k8s.io/apiextensions-apiserver => ../apiextensions-apiserver
k8s.io/apimachinery => ../apimachinery
k8s.io/apiserver => ../apiserver
k8s.io/client-go => ../client-go
k8s.io/code-generator => ../code-generator
k8s.io/component-base => ../component-base
k8s.io/kms => ../kms
k8s.io/api => k8s.io/api v0.0.0-20230424183503-a94d26e5d6b7
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230502173644-b1123d27117a
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20230502183633-fcfde5264caa
k8s.io/client-go => k8s.io/client-go v0.0.0-20230502175410-015caa2eed83
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20230502173038-1649c2d8b44c
k8s.io/component-base => k8s.io/component-base v0.0.0-20230502181637-54279fc3898f
k8s.io/kms => k8s.io/kms v0.0.0-20230315071547-f5c193c64781
)
14 changes: 14 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -745,11 +745,25 @@ 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-20230424183503-a94d26e5d6b7 h1:QrPMgZCXYbzEq6h5azDuaqNoWs7rI3pKvW8pX/CBPqo=
k8s.io/api v0.0.0-20230424183503-a94d26e5d6b7/go.mod h1:RAYThv5ELmDNk2Kt+PWiwWtAI1TZyap1JK1QStRzwyw=
k8s.io/apimachinery v0.0.0-20230502173644-b1123d27117a h1:FId7MLgk0l0XnnlbixZAzcmQiWYsHGkIrxLlazD7RZA=
k8s.io/apimachinery v0.0.0-20230502173644-b1123d27117a/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E=
k8s.io/apiserver v0.0.0-20230502183633-fcfde5264caa h1:RXJIN0yRoLLlQIb67hZfhPfKidM04TBooVkMHcjIMDg=
k8s.io/apiserver v0.0.0-20230502183633-fcfde5264caa/go.mod h1:PiAz9NOiS1RDzf6OMP2QsVrUgaD76U7IpSXXW5xvXZA=
k8s.io/client-go v0.0.0-20230502175410-015caa2eed83 h1:Y+W7N9YdXoKgzczTPQap9z6ha7257t/tnXFHYgKDzEM=
k8s.io/client-go v0.0.0-20230502175410-015caa2eed83/go.mod h1:c5U8Am3vnVxXbWLPrdZf47GVO5Pli26D0XTiRdht1rA=
k8s.io/code-generator v0.0.0-20230502173038-1649c2d8b44c h1:8wzTnQ5hzqCC+LcquFdtfRvyknt+H9QvEj+abR2biNg=
k8s.io/code-generator v0.0.0-20230502173038-1649c2d8b44c/go.mod h1:DPung1sI5vBgn4AGKtlPRQAyagj/ir/4jI55ipZHVww=
k8s.io/component-base v0.0.0-20230502181637-54279fc3898f h1:UWQK+dUu4rd9VzjfwQhn4eP5YFqxKVoFHSSmrIXg3hI=
k8s.io/component-base v0.0.0-20230502181637-54279fc3898f/go.mod h1:q1A7LzmGZZvn6c5hRvuQ1h8peLmhvnZJQ9lxIdTrLUE=
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d h1:U9tB195lKdzwqicbJvyJeOXV7Klv+wNAWENRnXEGi08=
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
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-20230501164219-8b0f38b5fd1f h1:2kWPakN3i/k81b0gvD5C5FJ2kxm1WrQFanWchyKuqGg=
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f/go.mod h1:byini6yhqGC14c3ebc/QwanvYwhuMWF6yz2F8uwW8eg=
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
Expand Down

0 comments on commit 1158d6a

Please sign in to comment.