Skip to content

Commit 4a8722b

Browse files
Merge remote-tracking branch 'origin/master' into release-1.26
Kubernetes-commit: 713b671a8a3fb526ba616a26953a91026c77611f
1 parent ead8e6d commit 4a8722b

File tree

2 files changed

+20
-11
lines changed

2 files changed

+20
-11
lines changed

go.mod

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ require (
4242
google.golang.org/protobuf v1.28.1
4343
gopkg.in/natefinch/lumberjack.v2 v2.0.0
4444
gopkg.in/square/go-jose.v2 v2.2.2
45-
k8s.io/api v0.0.0
46-
k8s.io/apimachinery v0.0.0
47-
k8s.io/client-go v0.0.0
48-
k8s.io/component-base v0.0.0
45+
k8s.io/api v0.0.0-20221208060720-07ac8fe9ce91
46+
k8s.io/apimachinery v0.0.0-20221208055745-5d4cdd22b0f7
47+
k8s.io/client-go v0.0.0-20221208062233-95a14c3f4bc4
48+
k8s.io/component-base v0.0.0-20221207035525-9c5f85259cb9
4949
k8s.io/klog/v2 v2.80.1
50-
k8s.io/kms v0.0.0
50+
k8s.io/kms v0.0.0-20221208063806-3bf04e13ad9a
5151
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280
5252
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d
5353
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.33
@@ -122,10 +122,9 @@ require (
122122
)
123123

124124
replace (
125-
k8s.io/api => ../api
126-
k8s.io/apimachinery => ../apimachinery
127-
k8s.io/apiserver => ../apiserver
128-
k8s.io/client-go => ../client-go
129-
k8s.io/component-base => ../component-base
130-
k8s.io/kms => ../kms
125+
k8s.io/api => k8s.io/api v0.0.0-20221208060720-07ac8fe9ce91
126+
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20221208055745-5d4cdd22b0f7
127+
k8s.io/client-go => k8s.io/client-go v0.0.0-20221208062233-95a14c3f4bc4
128+
k8s.io/component-base => k8s.io/component-base v0.0.0-20221207035525-9c5f85259cb9
129+
k8s.io/kms => k8s.io/kms v0.0.0-20221208063806-3bf04e13ad9a
131130
)

go.sum

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -986,8 +986,18 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
986986
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
987987
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
988988
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
989+
k8s.io/api v0.0.0-20221208060720-07ac8fe9ce91 h1:xVuXb+iGNa+jCsqfhp0u1N4L+9vf7fF1gZJ6WZRnJU8=
990+
k8s.io/api v0.0.0-20221208060720-07ac8fe9ce91/go.mod h1:GetGjgKCUeHLs1GMrltnUDUYPvhhro0e4BozgWsM0Jk=
991+
k8s.io/apimachinery v0.0.0-20221208055745-5d4cdd22b0f7 h1:6WftyyXbOkaz1aO+YA8Z5774ZvYeQOUk1JUkvPaOTvE=
992+
k8s.io/apimachinery v0.0.0-20221208055745-5d4cdd22b0f7/go.mod h1:tnPmbONNJ7ByJNz9+n9kMjNP8ON+1qoAIIC70lztu74=
993+
k8s.io/client-go v0.0.0-20221208062233-95a14c3f4bc4 h1:qpWxX9HVLEv3ZXLUUoCxV6sqQ/6kpiAJ+WfF5Tr1UbY=
994+
k8s.io/client-go v0.0.0-20221208062233-95a14c3f4bc4/go.mod h1:FDjREoPmQrCli+ysHI2WFxvn4+R8vuDVkAF5LLumu+k=
995+
k8s.io/component-base v0.0.0-20221207035525-9c5f85259cb9 h1:rvVuVaZqMGPjhF3Wm9XcT7fpBpZCo5EqhUk4TfPHEEg=
996+
k8s.io/component-base v0.0.0-20221207035525-9c5f85259cb9/go.mod h1:8YfUcnMd4ifwccvuV+B+kX0gKRWeI/pnousYIdTIp4U=
989997
k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4=
990998
k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
999+
k8s.io/kms v0.0.0-20221208063806-3bf04e13ad9a h1:41OBvSWw9lfYgFdEHWjEINfXFf8/vAVZER7ZFMhePwA=
1000+
k8s.io/kms v0.0.0-20221208063806-3bf04e13ad9a/go.mod h1:ReC1IEGuxgfN+PDCIpR6w8+XMmDE7uJhxcCwMZFdIYc=
9911001
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+OGxg8HsuBr/5f6tVAjDu6E=
9921002
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4=
9931003
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d h1:0Smp/HP1OH4Rvhe+4B8nWGERtlqAGSftbSbbmm45oFs=

0 commit comments

Comments
 (0)