From f91199275b5de56ccbf08c34078a711585ff9b18 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Thu, 22 Sep 2022 07:14:21 -0400 Subject: [PATCH] Update to latest k8s.io/utils to pick up changes Signed-off-by: Davanum Srinivas Kubernetes-commit: 4e7e7cdd3ce7cd0cec806298c2b7705ea240369c --- go.mod | 33 +++++++++++++++++---------------- go.sum | 21 ++------------------- 2 files changed, 19 insertions(+), 35 deletions(-) diff --git a/go.mod b/go.mod index ab849d70d..69db8e146 100644 --- a/go.mod +++ b/go.mod @@ -29,16 +29,16 @@ require ( github.com/stretchr/testify v1.8.0 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f gopkg.in/yaml.v2 v2.4.0 - k8s.io/api v0.0.0-20220921024056-79091dac6a32 - k8s.io/apimachinery v0.0.0-20220920023906-f8159af4957e - k8s.io/cli-runtime v0.0.0-20220921150432-64f1fa5659ee - k8s.io/client-go v0.0.0-20220921144450-2fd4aac19007 - k8s.io/component-base v0.0.0-20220921145036-7b8bf02c4c3a - k8s.io/component-helpers v0.0.0-20220921145130-6bc0b7292ca2 + k8s.io/api v0.0.0 + k8s.io/apimachinery v0.0.0 + k8s.io/cli-runtime v0.0.0 + k8s.io/client-go v0.0.0 + k8s.io/component-base v0.0.0 + k8s.io/component-helpers v0.0.0 k8s.io/klog/v2 v2.80.1 k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 - k8s.io/metrics v0.0.0-20220921150326-89b3fb4027d2 - k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed + k8s.io/metrics v0.0.0 + k8s.io/utils v0.0.0-20220922133306-665eaaec4324 sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 sigs.k8s.io/kustomize/kustomize/v4 v4.5.7 sigs.k8s.io/kustomize/kyaml v0.13.9 @@ -91,12 +91,13 @@ require ( ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20220921024056-79091dac6a32 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220920023906-f8159af4957e - k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20220921150432-64f1fa5659ee - k8s.io/client-go => k8s.io/client-go v0.0.0-20220921144450-2fd4aac19007 - k8s.io/code-generator => k8s.io/code-generator v0.0.0-20220921143723-8e999f2c282e - k8s.io/component-base => k8s.io/component-base v0.0.0-20220921145036-7b8bf02c4c3a - k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20220921145130-6bc0b7292ca2 - k8s.io/metrics => k8s.io/metrics v0.0.0-20220921150326-89b3fb4027d2 + k8s.io/api => ../api + k8s.io/apimachinery => ../apimachinery + k8s.io/cli-runtime => ../cli-runtime + k8s.io/client-go => ../client-go + k8s.io/code-generator => ../code-generator + k8s.io/component-base => ../component-base + k8s.io/component-helpers => ../component-helpers + k8s.io/kubectl => ../kubectl + k8s.io/metrics => ../metrics ) diff --git a/go.sum b/go.sum index faa2488e6..93bb7a1e1 100644 --- a/go.sum +++ b/go.sum @@ -78,7 +78,6 @@ github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= @@ -231,7 +230,6 @@ github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNue github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= -github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= github.com/spf13/cobra v1.5.0 h1:X+jTBEBqF0bHN+9cSMgmfuvv2VHJ9ezmFNf9Y/XstYU= github.com/spf13/cobra v1.5.0/go.mod h1:dWXEIy2H428czQCjInthrTRUg7yKbok+2Qi/yBIJoUM= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= @@ -541,27 +539,12 @@ 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-20220921024056-79091dac6a32 h1:XqOnEE4qi/41B0Aw1TtCMBYTFCWUwClqqY937J6YdHE= -k8s.io/api v0.0.0-20220921024056-79091dac6a32/go.mod h1:TCn8BrGoJbxQ9QglNsNhQ/1gFy4cEQ912+2vx6tJD9s= -k8s.io/apimachinery v0.0.0-20220920023906-f8159af4957e h1:gkaJe0+f48lrEpQj6xocjdA9XgPyXef+OEqnt+3HgkI= -k8s.io/apimachinery v0.0.0-20220920023906-f8159af4957e/go.mod h1:YxcSfgHt+jqvurbA0MLOvpo1OlrnkzW3sZTxMu+hrgI= -k8s.io/cli-runtime v0.0.0-20220921150432-64f1fa5659ee h1:X9TSSkt+V1TA0+YJRBGtYujkGg6e9U93sVBFD8Hy4A0= -k8s.io/cli-runtime v0.0.0-20220921150432-64f1fa5659ee/go.mod h1:Xp9iyGiDnH59WdZRJ9JxNap9FuG73uXqBVhL9lIJnvg= -k8s.io/client-go v0.0.0-20220921144450-2fd4aac19007 h1:x5h1hphMyKQO+kdcBUJrimhddbbksTbFpJS/MMLVZQc= -k8s.io/client-go v0.0.0-20220921144450-2fd4aac19007/go.mod h1:Q+72Y2xuyj63bldiVIjM997NxveMRMcgxN88lb4IBFA= -k8s.io/component-base v0.0.0-20220921145036-7b8bf02c4c3a h1:rFMDNclpX7NbvIibKWQmck2UQD7eSfg8USsjIRKK8cc= -k8s.io/component-base v0.0.0-20220921145036-7b8bf02c4c3a/go.mod h1:Lqg7dJ+Bw5rBXwP6IL5NvMU2jq3edH8at07ntXlQau0= -k8s.io/component-helpers v0.0.0-20220921145130-6bc0b7292ca2 h1:bbJhqmCzx9/zvrXf+apLGOoInnXuaUBZ2o8+KQFgiEc= -k8s.io/component-helpers v0.0.0-20220921145130-6bc0b7292ca2/go.mod h1:dn+DEJ4XYBOV14hMiPtJE6TLsHac14P1NHX3RlkRaR0= -k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4= k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 h1:MQ8BAZPZlWk3S9K4a9NCkIFQtZShWqoha7snGixVgEA= k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1/go.mod h1:C/N6wCaBHeBHkHUesQOQy2/MZqGgMAFPqGsGQLdbZBU= -k8s.io/metrics v0.0.0-20220921150326-89b3fb4027d2 h1:z+grJp7td4slgxul3nk3uHw6xYBHUnwrVxspnhfy1Wg= -k8s.io/metrics v0.0.0-20220921150326-89b3fb4027d2/go.mod h1:iVRdSgLhfGqrYf4Cz/YnYu8iQapj/NLZeTgRC12jHRA= -k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed h1:jAne/RjBTyawwAy0utX5eqigAwz/lQhTmy+Hr/Cpue4= -k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/utils v0.0.0-20220922133306-665eaaec4324 h1:i+xdFemcSNuJvIfBlaYuXgRondKxK4z4prVPKzEaelI= +k8s.io/utils v0.0.0-20220922133306-665eaaec4324/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=