From 1d0331df1baaa2042e737fbb0453295139d1c3e9 Mon Sep 17 00:00:00 2001 From: Alper Rifat Ulucinar Date: Wed, 10 Nov 2021 05:10:31 +0300 Subject: [PATCH] Manual cherry pick of kube-openapi changes for release-1.20 Bump kube-openapi against kube-openapi/release-1.20 branch Signed-off-by: Alper Rifat Ulucinar Kubernetes-commit: 892507dd5cb92000549bd4400d51f668708f4b7b --- go.mod | 17 +++++++++-------- go.sum | 12 ++---------- 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/go.mod b/go.mod index 5f3c7bfc..2e60d7a8 100644 --- a/go.mod +++ b/go.mod @@ -5,16 +5,17 @@ module k8s.io/sample-controller go 1.15 require ( - k8s.io/api v0.0.0-20211006163548-14384843a070 - k8s.io/apimachinery v0.0.0-20211006163247-43d03ae97b71 - k8s.io/client-go v0.0.0-20211006163948-3fc097df6b87 - k8s.io/code-generator v0.0.0-20211006163016-4100a7936525 + k8s.io/api v0.0.0 + k8s.io/apimachinery v0.0.0 + k8s.io/client-go v0.0.0 + k8s.io/code-generator v0.0.0 k8s.io/klog/v2 v2.4.0 ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20211006163548-14384843a070 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211006163247-43d03ae97b71 - k8s.io/client-go => k8s.io/client-go v0.0.0-20211006163948-3fc097df6b87 - k8s.io/code-generator => k8s.io/code-generator v0.0.0-20211006163016-4100a7936525 + k8s.io/api => ../api + k8s.io/apimachinery => ../apimachinery + k8s.io/client-go => ../client-go + k8s.io/code-generator => ../code-generator + k8s.io/sample-controller => ../sample-controller ) diff --git a/go.sum b/go.sum index 111059fb..9a1fff42 100644 --- a/go.sum +++ b/go.sum @@ -424,14 +424,6 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= 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= -k8s.io/api v0.0.0-20211006163548-14384843a070 h1:PrGxR6a22mtoEErqSzyltsRxQageCzbVz8mteNEPMZo= -k8s.io/api v0.0.0-20211006163548-14384843a070/go.mod h1:gHOy/bdYum9Xwc8Ku9HoIGlC1tK+Ca3mlbXyeZ2/m/g= -k8s.io/apimachinery v0.0.0-20211006163247-43d03ae97b71 h1:eyFEspMIgGSOTKwfII+oBcWX9gXJ6uXkNeeyymDHYRI= -k8s.io/apimachinery v0.0.0-20211006163247-43d03ae97b71/go.mod h1:uM7hCI0NyBymUwgshMgZyte475lxhr+QH6h3cvdnzEc= -k8s.io/client-go v0.0.0-20211006163948-3fc097df6b87 h1:ybAxnG6RHTtPOOR4hbR0PLwswlrjgq4VcupKZTu45Pc= -k8s.io/client-go v0.0.0-20211006163948-3fc097df6b87/go.mod h1:fFi+f8HlL6qZD1lkepeJAf+COWsznTlc6FanXk8VWw4= -k8s.io/code-generator v0.0.0-20211006163016-4100a7936525 h1:jDmEb6IUIJOBuA1FXZVtYJvDqyy0uxYsrZPZCkSqR70= -k8s.io/code-generator v0.0.0-20211006163016-4100a7936525/go.mod h1:MN7M2OmA4DntSwTmKqoB92uDBwM+OE0XtZ9piV7SXG4= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201113003025-83324d819ded h1:JApXBKYyB7l9xx+DK7/+mFjC7A9Bt5A93FPvFD0HIFE= k8s.io/gengo v0.0.0-20201113003025-83324d819ded/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= @@ -439,8 +431,8 @@ k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ= k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= -k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd h1:sOHNzJIkytDF6qadMNKhhDRpc6ODik8lVC6nOur7B2c= -k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= +k8s.io/kube-openapi v0.0.0-20211110013926-83f114cd0513 h1:pbudjNtv90nOgR0/DUhPwKHnQ55Khz8+sNhJBIK7A5M= +k8s.io/kube-openapi v0.0.0-20211110013926-83f114cd0513/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= k8s.io/utils v0.0.0-20201110183641-67b214c5f920 h1:CbnUZsM497iRC5QMVkHwyl8s2tB3g7yaSHkYPkpgelw= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=