Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into release-1.26
Browse files Browse the repository at this point in the history
Kubernetes-commit: 713b671a8a3fb526ba616a26953a91026c77611f
  • Loading branch information
k8s-publishing-bot committed Dec 8, 2022
1 parent 2f29442 commit 97c2f7c
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 @@ -13,12 +13,12 @@ require (
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.8.0
golang.org/x/net v0.3.1-0.20221206200815-1e63c2f08a10
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-20221208060720-07ac8fe9ce91
k8s.io/apimachinery v0.0.0-20221208055745-5d4cdd22b0f7
k8s.io/apiserver v0.0.0-20221208065907-4a8722b9db55
k8s.io/client-go v0.0.0-20221208062233-95a14c3f4bc4
k8s.io/code-generator v0.0.0-20221208054844-6063700ba34d
k8s.io/component-base v0.0.0-20221207035525-9c5f85259cb9
k8s.io/klog/v2 v2.80.1
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d
Expand Down Expand Up @@ -101,19 +101,18 @@ require (
gopkg.in/yaml.v2 v2.4.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-20221208063806-3bf04e13ad9a // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.33 // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)

replace (
k8s.io/api => ../api
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/kube-aggregator => ../kube-aggregator
k8s.io/api => k8s.io/api v0.0.0-20221208060720-07ac8fe9ce91
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20221208055745-5d4cdd22b0f7
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20221208065907-4a8722b9db55
k8s.io/client-go => k8s.io/client-go v0.0.0-20221208062233-95a14c3f4bc4
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20221208054844-6063700ba34d
k8s.io/component-base => k8s.io/component-base v0.0.0-20221207035525-9c5f85259cb9
k8s.io/kms => k8s.io/kms v0.0.0-20221208063806-3bf04e13ad9a
)
14 changes: 14 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -722,11 +722,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-20221208060720-07ac8fe9ce91 h1:xVuXb+iGNa+jCsqfhp0u1N4L+9vf7fF1gZJ6WZRnJU8=
k8s.io/api v0.0.0-20221208060720-07ac8fe9ce91/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/apiserver v0.0.0-20221208065907-4a8722b9db55 h1:z30rsPyMuxjfXhOgQTTFRf+sDg1QwlaTXvVM4lJljpY=
k8s.io/apiserver v0.0.0-20221208065907-4a8722b9db55/go.mod h1:SwHU2zVOUnJ43twyKWw+YVEOMCakCK3E5lmo4bPLlD8=
k8s.io/client-go v0.0.0-20221208062233-95a14c3f4bc4 h1:qpWxX9HVLEv3ZXLUUoCxV6sqQ/6kpiAJ+WfF5Tr1UbY=
k8s.io/client-go v0.0.0-20221208062233-95a14c3f4bc4/go.mod h1:FDjREoPmQrCli+ysHI2WFxvn4+R8vuDVkAF5LLumu+k=
k8s.io/code-generator v0.0.0-20221208054844-6063700ba34d h1:N3ad8NSOang9kMhOCQxvoGqMPEoUP6QNJCYCfqBfHY8=
k8s.io/code-generator v0.0.0-20221208054844-6063700ba34d/go.mod h1:OMoJ5Dqx1wgaQzKgc+ZWaZPfGjdRq/Y3WubFrZmeI3I=
k8s.io/component-base v0.0.0-20221207035525-9c5f85259cb9 h1:rvVuVaZqMGPjhF3Wm9XcT7fpBpZCo5EqhUk4TfPHEEg=
k8s.io/component-base v0.0.0-20221207035525-9c5f85259cb9/go.mod h1:8YfUcnMd4ifwccvuV+B+kX0gKRWeI/pnousYIdTIp4U=
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.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4=
k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
k8s.io/kms v0.0.0-20221208063806-3bf04e13ad9a h1:41OBvSWw9lfYgFdEHWjEINfXFf8/vAVZER7ZFMhePwA=
k8s.io/kms v0.0.0-20221208063806-3bf04e13ad9a/go.mod h1:ReC1IEGuxgfN+PDCIpR6w8+XMmDE7uJhxcCwMZFdIYc=
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+OGxg8HsuBr/5f6tVAjDu6E=
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4=
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d h1:0Smp/HP1OH4Rvhe+4B8nWGERtlqAGSftbSbbmm45oFs=
Expand Down

0 comments on commit 97c2f7c

Please sign in to comment.