From cd2acba1859269f69b4d8b05bad29cb98689637e Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Wed, 16 Mar 2022 15:14:10 -0700 Subject: [PATCH] Merge pull request #108644 from Jefftree/googleapis-gnostic googleapis/gnostic -> google/gnostic and update kube-openapi Kubernetes-commit: b195a64d45e1880878a22d178055f1b4220dcb43 --- go.mod | 31 +++++++++++++++---------------- go.sum | 17 +++++++++++++++-- 2 files changed, 30 insertions(+), 18 deletions(-) diff --git a/go.mod b/go.mod index ecb3573f9..4d49981ef 100644 --- a/go.mod +++ b/go.mod @@ -31,15 +31,15 @@ require ( github.com/stretchr/testify v1.7.0 golang.org/x/sys v0.0.0-20220209214540-3681064d5158 gopkg.in/yaml.v2 v2.4.0 - 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/api v0.0.0-20220317021646-b9830ac37b46 + k8s.io/apimachinery v0.0.0-20220317021027-c68a4df61d4d + k8s.io/cli-runtime v0.0.0-20220319184351-8dd57697301b + k8s.io/client-go v0.0.0-20220317022426-6889a6b513d4 + k8s.io/component-base v0.0.0-20220317023659-c5dae0cde26e + k8s.io/component-helpers v0.0.0-20220317024050-85dd3119a14e k8s.io/klog/v2 v2.40.1 k8s.io/kube-openapi v0.0.0-20220316025549-ddc66922ab18 - k8s.io/metrics v0.0.0 + k8s.io/metrics v0.0.0-20220319183727-657a3501c994 k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 sigs.k8s.io/kustomize/kustomize/v4 v4.4.1 @@ -48,13 +48,12 @@ require ( ) replace ( - 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 + k8s.io/api => k8s.io/api v0.0.0-20220317021646-b9830ac37b46 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220317021027-c68a4df61d4d + k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20220319184351-8dd57697301b + k8s.io/client-go => k8s.io/client-go v0.0.0-20220317022426-6889a6b513d4 + k8s.io/code-generator => k8s.io/code-generator v0.0.0-20220317020552-cdbee2b416a6 + k8s.io/component-base => k8s.io/component-base v0.0.0-20220317023659-c5dae0cde26e + k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20220317024050-85dd3119a14e + k8s.io/metrics => k8s.io/metrics v0.0.0-20220319183727-657a3501c994 ) diff --git a/go.sum b/go.sum index bd07cf348..42adef11e 100644 --- a/go.sum +++ b/go.sum @@ -62,11 +62,9 @@ github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRF github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= -github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= -github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= @@ -850,6 +848,19 @@ 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-20220317021646-b9830ac37b46 h1:GiOCYRoSGe/xX3X60/Z+3Xq6C9/dyKcRElTN01Hpg3o= +k8s.io/api v0.0.0-20220317021646-b9830ac37b46/go.mod h1:RvsmB1DuKSEVw+3ZZ6fseROF1PYQkewMo0uNNvIcXKs= +k8s.io/apimachinery v0.0.0-20220317021027-c68a4df61d4d h1:X97IrPL+mdzFxeVmVkbtko19rowdqorN20036BKf+qQ= +k8s.io/apimachinery v0.0.0-20220317021027-c68a4df61d4d/go.mod h1:Xig8YiaWvp151KCOs9q3j/mLnW/ooZAR6EtxqHwhtD0= +k8s.io/cli-runtime v0.0.0-20220319184351-8dd57697301b h1:W+IfaoVJ7qTkfWbW8wQ/XBtYM0ArVa2/goZxF2mq38s= +k8s.io/cli-runtime v0.0.0-20220319184351-8dd57697301b/go.mod h1:wed/MDb+CPaezj4DJvafsK6lPdJc6lA2yv7ncI9ehXA= +k8s.io/client-go v0.0.0-20220317022426-6889a6b513d4 h1:WJ6/FLxLxxn9ZZ5EvgfXxRp7gmM3BazP9nDgRckP0/A= +k8s.io/client-go v0.0.0-20220317022426-6889a6b513d4/go.mod h1:R1qGhn0GbR+sGAtVNigCRU8sJw8z6qMZrPFK8CZ4Cs0= +k8s.io/code-generator v0.0.0-20220317020552-cdbee2b416a6/go.mod h1:f6E+BgTk8onkBfwvIkiR0bo407Qt+HzXQThjtFQtW5M= +k8s.io/component-base v0.0.0-20220317023659-c5dae0cde26e h1:n/o6H3aUL5zCceACfq4tu5ogq86BLfrTPc/ZZr4KzbY= +k8s.io/component-base v0.0.0-20220317023659-c5dae0cde26e/go.mod h1:NLi1Z0XVyd14kA5naS5PvPwSONj7gRtkwuF2oMI7t0s= +k8s.io/component-helpers v0.0.0-20220317024050-85dd3119a14e h1:8zahGgD+EvdEFDKgcjm6Hc9O6YnbgPUKIwVgxxrpnog= +k8s.io/component-helpers v0.0.0-20220317024050-85dd3119a14e/go.mod h1:1m08OHQ9rbiTiaxjbLv3jJM8nzxe7S5XUXl3wjrlpM0= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/gengo v0.0.0-20211129171323-c02415ce4185/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= @@ -860,6 +871,8 @@ k8s.io/klog/v2 v2.40.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= k8s.io/kube-openapi v0.0.0-20220316025549-ddc66922ab18 h1:M0Korml79JW27ndc6lxLxkNP8QVqdpBj0MIEZliKy8A= k8s.io/kube-openapi v0.0.0-20220316025549-ddc66922ab18/go.mod h1:p8bjuqy9+BWvBDEBjdeVYtX6kMWWg6OhY1V1jhC9MPI= +k8s.io/metrics v0.0.0-20220319183727-657a3501c994 h1:e45UzW9RzWLbqprt2/yMuv2id60IQUrK0oc0AoVl+Ro= +k8s.io/metrics v0.0.0-20220319183727-657a3501c994/go.mod h1:7aFJWnDKVwAU71E9NHyPF577Po+UNrvJxGjmx0oJLXQ= k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 h1:HNSDgDCrr/6Ly3WEGKZftiE7IY19Vz2GdbOCyI4qqhc= k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=