From 0c72047da46201878304805ce718c87dae3e5cac 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 | 27 +++++++++++++-------------- go.sum | 13 +++++++++++++ 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/go.mod b/go.mod index 190a4390d..261d8a268 100644 --- a/go.mod +++ b/go.mod @@ -34,14 +34,14 @@ require ( github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1 // indirect golang.org/x/sys v0.0.0-20201112073958-5cba982894dd gopkg.in/yaml.v2 v2.2.8 - 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/api v0.0.0-20210712061623-33e331166f19 + k8s.io/apimachinery v0.0.0-20210712060932-83e9e94b75f3 + k8s.io/cli-runtime v0.0.0-20210712073813-0c4cac938137 + k8s.io/client-go v0.0.0-20210712062501-9ee1ae5c8765 + k8s.io/component-base v0.0.0-20210712064455-fbf24dae27f3 k8s.io/klog/v2 v2.2.0 k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6 - k8s.io/metrics v0.0.0 + k8s.io/metrics v0.0.0-20210712073333-bb509e61453a k8s.io/utils v0.0.0-20200729134348-d5654de09c73 sigs.k8s.io/kustomize v2.0.3+incompatible sigs.k8s.io/yaml v1.2.0 @@ -49,12 +49,11 @@ 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/kubectl => ../kubectl - k8s.io/metrics => ../metrics + k8s.io/api => k8s.io/api v0.0.0-20210712061623-33e331166f19 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210712060932-83e9e94b75f3 + k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20210712073813-0c4cac938137 + k8s.io/client-go => k8s.io/client-go v0.0.0-20210712062501-9ee1ae5c8765 + k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210712060345-d4966a97a24a + k8s.io/component-base => k8s.io/component-base v0.0.0-20210712064455-fbf24dae27f3 + k8s.io/metrics => k8s.io/metrics v0.0.0-20210712073333-bb509e61453a ) diff --git a/go.sum b/go.sum index e2910ef55..4f6fa81b2 100644 --- a/go.sum +++ b/go.sum @@ -507,6 +507,17 @@ 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/cli-runtime v0.0.0-20210712073813-0c4cac938137 h1:QiEPbyGAIf3zCML7KwfHO0E4menvyH+/fvmDSHQISns= +k8s.io/cli-runtime v0.0.0-20210712073813-0c4cac938137/go.mod h1:zNrAfumXErSdqtBVKYZn/VJqqwt3G5SGYpKFBtLucEk= +k8s.io/client-go v0.0.0-20210712062501-9ee1ae5c8765 h1:d6fpFDVOUosUmNfiXeyk1TJu9V5po2zfTHoH3SCzW3c= +k8s.io/client-go v0.0.0-20210712062501-9ee1ae5c8765/go.mod h1:5yX6KNTyGD7tHrFgK8T6rQIt1UpMtCAKVhMlJVwEw38= +k8s.io/code-generator v0.0.0-20210712060345-d4966a97a24a/go.mod h1:ADrDvaUQWGn4a8lX0ONtzb7uFmDRQOMSYIMk1qWIAx8= +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/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= @@ -514,6 +525,8 @@ k8s.io/klog/v2 v2.2.0 h1:XRvcwJozkgZ1UQJmfMGpvRthQHOvihEhYtDfAaxMz/A= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6 h1:+WnxoVtG8TMiudHBSEtrVL1egv36TkkJm+bA8AxicmQ= k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o= +k8s.io/metrics v0.0.0-20210712073333-bb509e61453a h1:Y7x+EGrGEOwzNkzZxErrRpKS2TfVK8kbovFA8MK0/ZY= +k8s.io/metrics v0.0.0-20210712073333-bb509e61453a/go.mod h1:O/ks5Sq579qfgJXY0MnQ8h4i+cS+FvsDmsesOcHWLI0= k8s.io/utils v0.0.0-20200729134348-d5654de09c73 h1:uJmqzgNWG7XyClnU/mLPBWwfKKF1K8Hf8whTseBgJcg= k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=