From bc1491ff531e7935002000eef2b8d1997c2610b4 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Fri, 14 Jan 2022 20:46:27 -0800 Subject: [PATCH] Merge pull request #107569 from jiahuif-forks/automated-cherry-pick-of-#107565-upstream-release-1.21 Automated cherry pick of #107565: upgrade sigs.k8s.io/structured-merge-diff/v4 to v4.2.1 Kubernetes-commit: 80b625cdfb1b5af2fb545187e9fab045ef71858b --- go.mod | 23 ++++++++++++----------- go.sum | 12 ++++++++++++ 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index 2405d3d..37eb534 100644 --- a/go.mod +++ b/go.mod @@ -5,18 +5,19 @@ module k8s.io/kube-controller-manager go 1.16 require ( - k8s.io/apimachinery v0.0.0 - k8s.io/cloud-provider v0.0.0 - k8s.io/controller-manager v0.0.0 + k8s.io/apimachinery v0.0.0-20220115052204-78994e499d98 + k8s.io/cloud-provider v0.0.0-20220115070807-8692145fd8f0 + k8s.io/controller-manager v0.0.0-20220115070443-86919f8008b3 ) replace ( - k8s.io/api => ../api - k8s.io/apimachinery => ../apimachinery - k8s.io/apiserver => ../apiserver - k8s.io/client-go => ../client-go - k8s.io/cloud-provider => ../cloud-provider - k8s.io/component-base => ../component-base - k8s.io/controller-manager => ../controller-manager - k8s.io/kube-controller-manager => ../kube-controller-manager + k8s.io/api => k8s.io/api v0.0.0-20220115052846-e18a4d4fc464 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220115052204-78994e499d98 + k8s.io/apiserver => k8s.io/apiserver v0.0.0-20220115061259-28b4e0c7fdba + k8s.io/client-go => k8s.io/client-go v0.0.0-20220115054131-b3fbf6e0969c + k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20220115070807-8692145fd8f0 + k8s.io/component-base => k8s.io/component-base v0.0.0-20220115060018-f909b6138d3a + k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20220115070443-86919f8008b3 ) + +replace k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20220115060335-8abce15f8c02 diff --git a/go.sum b/go.sum index 9c57f1d..de42f0c 100644 --- a/go.sum +++ b/go.sum @@ -598,6 +598,18 @@ 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-20220115052846-e18a4d4fc464 h1:zYUcImzLfRgIQsp4xwYBORc3oXjMyyPzmJN8cEf6+uA= +k8s.io/api v0.0.0-20220115052846-e18a4d4fc464/go.mod h1:1rXHa5F5YY7BxmZm5XoXjqq5GH54ggnxTlrxLwHlhU4= +k8s.io/apimachinery v0.0.0-20220115052204-78994e499d98 h1:mf2T8QRJGaH7h0qKnSq22AW9lUrPhWZoFILJQHjo/y8= +k8s.io/apimachinery v0.0.0-20220115052204-78994e499d98/go.mod h1:USs+ifLG6ZUgHGA/9lGxjdHzCB3hUO3fG1VBOwi0IHo= +k8s.io/apiserver v0.0.0-20220115061259-28b4e0c7fdba/go.mod h1:luZ7/XvsN+9FvyvurtDpZ7e7Eung0wP+uqAC02DiVPo= +k8s.io/client-go v0.0.0-20220115054131-b3fbf6e0969c/go.mod h1:HDCOYGDWxScC1nCYosGAtt/KJ4Z1oPvZO7vHxJqViqo= +k8s.io/cloud-provider v0.0.0-20220115070807-8692145fd8f0 h1:4lakSyoVg1jK2JqBPTg5KAcgiF2kJiL7MVN9/ZieOI8= +k8s.io/cloud-provider v0.0.0-20220115070807-8692145fd8f0/go.mod h1:zCKLewRG/NfV5sI4EA7iSIF2ZZnsLsi0FqpPWVvRcL0= +k8s.io/component-base v0.0.0-20220115060018-f909b6138d3a h1:qFeQ4GGwKLL8VSufJdo6HmmZ++srONLQhqim2dmaiB8= +k8s.io/component-base v0.0.0-20220115060018-f909b6138d3a/go.mod h1:j/aHqbiEuZmEZlWqi94dD+caUzZ/DIkYj+t4B9/tVrM= +k8s.io/controller-manager v0.0.0-20220115070443-86919f8008b3 h1:slca51YgXqhGnbgdQqPMZOj1kj5jTzOz89YVPEy84P8= +k8s.io/controller-manager v0.0.0-20220115070443-86919f8008b3/go.mod h1:UtV8sq6rVlAl/L/qfn6Hnoo1r8PNGNaQFdrA3UWmZPQ= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.9.0 h1:D7HV+n1V57XeZ0m6tdRkfknthUaM06VFbWldOFh8kzM=