From 9b5c8c166e64c42869df175d63ba58ba8df3cf99 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Mon, 21 Feb 2022 07:46:15 -0800 Subject: [PATCH] Merge pull request #107105 from justaugustus/go118 golang: Update to go1.18rc1 Kubernetes-commit: bda996e6a7cd115d76ebf1e0c127bee68e06269a --- go.mod | 31 +++++++++++++++---------------- go.sum | 17 +++++++++++++++-- 2 files changed, 30 insertions(+), 18 deletions(-) diff --git a/go.mod b/go.mod index 13f96af2d..11d403996 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-20220221180259-1b1f1b71391a + k8s.io/apimachinery v0.0.0-20220221180106-4f3ae9f49dfd + k8s.io/cli-runtime v0.0.0-20220221182607-1d7a7893878d + k8s.io/client-go v0.0.0-20220221180547-41e0447e7728 + k8s.io/component-base v0.0.0-20220221181124-924f9ce30004 + k8s.io/component-helpers v0.0.0-20220221181225-89b3c2ca20da k8s.io/klog/v2 v2.40.1 k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 - k8s.io/metrics v0.0.0 + k8s.io/metrics v0.0.0-20220221182457-ef134ca0a988 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-20220221180259-1b1f1b71391a + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220221180106-4f3ae9f49dfd + k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20220221182607-1d7a7893878d + k8s.io/client-go => k8s.io/client-go v0.0.0-20220221180547-41e0447e7728 + k8s.io/code-generator => k8s.io/code-generator v0.0.0-20220221175922-0c4a6d91c95d + k8s.io/component-base => k8s.io/component-base v0.0.0-20220221181124-924f9ce30004 + k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20220221181225-89b3c2ca20da + k8s.io/metrics => k8s.io/metrics v0.0.0-20220221182457-ef134ca0a988 ) diff --git a/go.sum b/go.sum index b9be9c682..3001c9840 100644 --- a/go.sum +++ b/go.sum @@ -64,13 +64,11 @@ github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk5 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= 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-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= 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= @@ -921,6 +919,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-20220221180259-1b1f1b71391a h1:ML6/aBZtqMi2K+l616/Z4dch6xDjm5yzQk57jWEmzjc= +k8s.io/api v0.0.0-20220221180259-1b1f1b71391a/go.mod h1:yCyzcivy4x5q7/J89ZAVZ4hyNaWQ0xclW3Q0EVO/+O0= +k8s.io/apimachinery v0.0.0-20220221180106-4f3ae9f49dfd h1:tNlq8z78sk9bvzg1ooRot5Q6s2vVlDZBWNHuVG98Zek= +k8s.io/apimachinery v0.0.0-20220221180106-4f3ae9f49dfd/go.mod h1:6HjHJr7AD3yHuu+gOdE3O1dqE21lBVCDBk5W7wry/WI= +k8s.io/cli-runtime v0.0.0-20220221182607-1d7a7893878d h1:kVNVC7PpJTDg8Q3FZqZ0l8a46jambiYt3cx9SQRtvhQ= +k8s.io/cli-runtime v0.0.0-20220221182607-1d7a7893878d/go.mod h1:C/IVuWJzuw8sMRBUUqFdI2VPQQ/drnZ4FWItz2FMfYc= +k8s.io/client-go v0.0.0-20220221180547-41e0447e7728 h1:9Js/Im57CQqVzjSkiYHR5D2D9FHmg3f6iICe0u1Jagw= +k8s.io/client-go v0.0.0-20220221180547-41e0447e7728/go.mod h1:hR22xcjxyiLB1Y5LqlyQqmrIA57Ig3EKHyG8YcCfO7A= +k8s.io/code-generator v0.0.0-20220221175922-0c4a6d91c95d/go.mod h1:BunYIiSvEAW736r5Q7j7shOSPkb80INs0kWYJvW2o6I= +k8s.io/component-base v0.0.0-20220221181124-924f9ce30004 h1:+DRCmgSxq4do9tY7vaWJqRtNDpnfsjd4CTyZ9nHO7r8= +k8s.io/component-base v0.0.0-20220221181124-924f9ce30004/go.mod h1:2byKje/EPFY7smkxa+a1tJLJJZt+WVR577fzinhH42s= +k8s.io/component-helpers v0.0.0-20220221181225-89b3c2ca20da h1:DHznXI/E7tE7qoDM5VPAljGMJxOOogXGyomShHt0taw= +k8s.io/component-helpers v0.0.0-20220221181225-89b3c2ca20da/go.mod h1:MzBcxeXXL5/4kCYuPlCDOpLIxf3hj/qRUgoruFvVO+Y= 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= @@ -931,6 +942,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-20211115234752-e816edb12b65 h1:E3J9oCLlaobFUqsjG9DfKbP2BmgwBL2p7pn0A3dG9W4= k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk= +k8s.io/metrics v0.0.0-20220221182457-ef134ca0a988 h1:Wqy28C/aPZA82h0gMcaQjHv1D1B8Wz76w+EVq2zhnqk= +k8s.io/metrics v0.0.0-20220221182457-ef134ca0a988/go.mod h1:Vl5KTdhmHPeRNbGEM6a4+YllwkL1nd1eazdlX/cH3F4= 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=