From dcbb1592806f27b2220525f3d20f96452dbc5fb6 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Fri, 9 Jul 2021 12:24:54 -0700 Subject: [PATCH] Merge pull request #103321 from jpbetz/fix-102749-1.19 Manual cherry pick of #103318: Bump SMD to v4.1.2 to pick up #102749 fix Kubernetes-commit: 6ca436bf0801ae96685b7a8daf093f74349b1d83 --- go.mod | 15 +++++++-------- go.sum | 7 +++++++ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 00b883f..ecd6ecc 100644 --- a/go.mod +++ b/go.mod @@ -8,15 +8,14 @@ require ( github.com/gogo/protobuf v1.3.2 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b google.golang.org/grpc v1.27.0 - k8s.io/api v0.0.0 - k8s.io/apimachinery v0.0.0 - k8s.io/component-base v0.0.0 + k8s.io/api v0.0.0-20210712061623-33e331166f19 + k8s.io/apimachinery v0.0.0-20210712060932-83e9e94b75f3 + k8s.io/component-base v0.0.0-20210712064455-fbf24dae27f3 ) replace ( - k8s.io/api => ../api - k8s.io/apimachinery => ../apimachinery - k8s.io/client-go => ../client-go - k8s.io/component-base => ../component-base - k8s.io/kubelet => ../kubelet + k8s.io/api => k8s.io/api v0.0.0-20210712061623-33e331166f19 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210712060932-83e9e94b75f3 + k8s.io/client-go => k8s.io/client-go v0.0.0-20210712062501-9ee1ae5c8765 + k8s.io/component-base => k8s.io/component-base v0.0.0-20210712064455-fbf24dae27f3 ) diff --git a/go.sum b/go.sum index 6b0d3c7..0864953 100644 --- a/go.sum +++ b/go.sum @@ -368,6 +368,13 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= 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= +k8s.io/api v0.0.0-20210712061623-33e331166f19 h1:1hGJsTEZSpiLSIWPG88ak62KnmY0GYSGY3qOXIn4+Ws= +k8s.io/api v0.0.0-20210712061623-33e331166f19/go.mod h1:3YUNrS3YZCXipiLZ72bx8O/lWZN7wopU4mia01/MEg8= +k8s.io/apimachinery v0.0.0-20210712060932-83e9e94b75f3 h1:5l3oYNFwOPujQkVAkBKL/UzUH1IrwZkDRgW+FSrYvEY= +k8s.io/apimachinery v0.0.0-20210712060932-83e9e94b75f3/go.mod h1:RMyblyny2ZcDQ/oVE+lC31u7XTHUaSXEK2IhgtwGxfc= +k8s.io/client-go v0.0.0-20210712062501-9ee1ae5c8765/go.mod h1:5yX6KNTyGD7tHrFgK8T6rQIt1UpMtCAKVhMlJVwEw38= +k8s.io/component-base v0.0.0-20210712064455-fbf24dae27f3 h1:gjddmHommEJ3swBPndOnEyCHGTgOAAS+Qv8pDJEcvag= +k8s.io/component-base v0.0.0-20210712064455-fbf24dae27f3/go.mod h1:lfpdN5gXjscAAc8n+0iI+lRZ9ctJSF3rjj2701gBAFc= 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.2.0 h1:XRvcwJozkgZ1UQJmfMGpvRthQHOvihEhYtDfAaxMz/A=