From ec131b0654e5e5909f01d9caeb61a96b206a4cd2 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Tue, 15 Nov 2022 10:16:41 -0800 Subject: [PATCH] Merge pull request #113919 from liggitt/go1.18-1.24 Manual cherry pick of #109440: update go.mod files to go 1.18 Kubernetes-commit: 3bd00ba2ef3955118d7ae72eb154be61bb4f6955 --- go.mod | 31 +++++++++++++++---------------- go.sum | 14 ++++++++++++++ 2 files changed, 29 insertions(+), 16 deletions(-) diff --git a/go.mod b/go.mod index 2ef53377..0dbbe7e4 100644 --- a/go.mod +++ b/go.mod @@ -29,15 +29,15 @@ require ( github.com/stretchr/testify v1.8.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-20221115215144-a01d6650879f + k8s.io/apimachinery v0.0.0-20221115214803-6b68b3797fe7 + k8s.io/cli-runtime v0.0.0-20221115223207-bb17ceae1d6d + k8s.io/client-go v0.0.0-20221115215723-128430567c40 + k8s.io/component-base v0.0.0-20221115220504-f5a6366a2adf + k8s.io/component-helpers v0.0.0-20221115220641-f255fd0f01f9 k8s.io/klog/v2 v2.60.1 k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 - k8s.io/metrics v0.0.0 + k8s.io/metrics v0.0.0-20221115223010-02c9231b318a k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 sigs.k8s.io/kustomize/kustomize/v4 v4.5.4 @@ -98,13 +98,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-20221115215144-a01d6650879f + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20221115214803-6b68b3797fe7 + k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20221115223207-bb17ceae1d6d + k8s.io/client-go => k8s.io/client-go v0.0.0-20221115215723-128430567c40 + k8s.io/code-generator => k8s.io/code-generator v0.0.0-20221115214433-a1b3f2f1d6be + k8s.io/component-base => k8s.io/component-base v0.0.0-20221115220504-f5a6366a2adf + k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20221115220641-f255fd0f01f9 + k8s.io/metrics => k8s.io/metrics v0.0.0-20221115223010-02c9231b318a ) diff --git a/go.sum b/go.sum index 61173246..d84fda54 100644 --- a/go.sum +++ b/go.sum @@ -762,6 +762,18 @@ 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-20221115215144-a01d6650879f h1:6GDXO5AaWmA5JGKyTAzEkJMgu0vV+d1yExs2FjoyDzk= +k8s.io/api v0.0.0-20221115215144-a01d6650879f/go.mod h1:5TWEcBgqRpn11oxuJSSFC1PIRS3ZPmpG8+AcHy1B3qk= +k8s.io/apimachinery v0.0.0-20221115214803-6b68b3797fe7 h1:SZ4S7i9TGLJlG88gpySRrfhXTyRyZGEiyAuwctixOQk= +k8s.io/apimachinery v0.0.0-20221115214803-6b68b3797fe7/go.mod h1:d6ct2HoIiXpJiQl5MY0qukHV38O9hWbTW1huL0StVl4= +k8s.io/cli-runtime v0.0.0-20221115223207-bb17ceae1d6d h1:GyCicFXQEdO36+Jrs32GP0gylzBKJu5ceZbPJY8Ce08= +k8s.io/cli-runtime v0.0.0-20221115223207-bb17ceae1d6d/go.mod h1:Um3qpo/4A0+zB5+0PBsxqSgEEHSGynS9G/QvGrDp4v8= +k8s.io/client-go v0.0.0-20221115215723-128430567c40 h1:Y3Pjt8ijR2vaGb7ut7EgyaBh7603mFCZbP8z93YQj7A= +k8s.io/client-go v0.0.0-20221115215723-128430567c40/go.mod h1:2K0x0tzaHZFx6kZFtGDN/zoStqXcOK5xxlxAII8c5gM= +k8s.io/component-base v0.0.0-20221115220504-f5a6366a2adf h1:dJx0A1eV9sNPAF6LBf8w+cMBr+mUUaCNYF9qwQHDKJg= +k8s.io/component-base v0.0.0-20221115220504-f5a6366a2adf/go.mod h1:djmPJNBRAEIe7fe9td8vWj5QN8m1EFH5innoIQ3w9Vs= +k8s.io/component-helpers v0.0.0-20221115220641-f255fd0f01f9 h1:1zod/ijhBf+3DStXDGN12eADL7noK1UsERQRsfhtdO8= +k8s.io/component-helpers v0.0.0-20221115220641-f255fd0f01f9/go.mod h1:/5XVxG8VOAgaRNIo+egynRCEvW0S42jPjgapCjR7d94= 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/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= @@ -771,6 +783,8 @@ k8s.io/klog/v2 v2.60.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-20220328201542-3ee0da9b0b42 h1:Gii5eqf+GmIEwGNKQYQClCayuJCe2/4fZUvF7VG99sU= k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42/go.mod h1:Z/45zLw8lUo4wdiUkI+v/ImEGAvu3WatcZl3lPMR4Rk= +k8s.io/metrics v0.0.0-20221115223010-02c9231b318a h1:GHGOHRe5QUFPF1dGq8GmH3oldnTLIahE1MC3IXadPpM= +k8s.io/metrics v0.0.0-20221115223010-02c9231b318a/go.mod h1:LaJciADY0j4lxFfizA8iuzGibgpOAt/sXBoQBCYdOag= 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=