From 383b7bd9efbb1065acf5c729562a606612271dee Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Thu, 25 Mar 2021 01:57:29 -0700 Subject: [PATCH] Merge pull request #99040 from apelisse/update-smd-1.19 Update sigs.k8s.io/structured-merge-diff to v4.0.3 Kubernetes-commit: 3303966843e96f6c6a85d3492ab79f1499989eda --- Godeps/Godeps.json | 14 +++++++------- go.mod | 27 +++++++++++++-------------- go.sum | 7 +++++++ 3 files changed, 27 insertions(+), 21 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index fa497118b..d28993b1b 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -756,19 +756,19 @@ }, { "ImportPath": "k8s.io/api", - "Rev": "2d800ca79443" + "Rev": "83a267c7608c" }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "4440c6847dae" + "Rev": "6d69a3e60ee7" }, { "ImportPath": "k8s.io/cli-runtime", - "Rev": "1703fe474ff1" + "Rev": "123888543321" }, { "ImportPath": "k8s.io/client-go", - "Rev": "e9b0f31f935b" + "Rev": "53d96299a20a" }, { "ImportPath": "k8s.io/code-generator", @@ -776,7 +776,7 @@ }, { "ImportPath": "k8s.io/component-base", - "Rev": "6401e5fe0504" + "Rev": "ddffa36eac61" }, { "ImportPath": "k8s.io/gengo", @@ -792,7 +792,7 @@ }, { "ImportPath": "k8s.io/metrics", - "Rev": "a267e1d7b083" + "Rev": "1010cd41fb2e" }, { "ImportPath": "k8s.io/utils", @@ -808,7 +808,7 @@ }, { "ImportPath": "sigs.k8s.io/structured-merge-diff/v4", - "Rev": "v4.0.1" + "Rev": "v4.0.3" }, { "ImportPath": "sigs.k8s.io/yaml", diff --git a/go.mod b/go.mod index 190a4390d..90847537f 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-20210325111313-83a267c7608c + k8s.io/apimachinery v0.0.0-20210325110524-6d69a3e60ee7 + k8s.io/cli-runtime v0.0.0-20210325125010-123888543321 + k8s.io/client-go v0.0.0-20210325113035-53d96299a20a + k8s.io/component-base v0.0.0-20210325114608-ddffa36eac61 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-20210325124441-1010cd41fb2e 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-20210325111313-83a267c7608c + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210325110524-6d69a3e60ee7 + k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20210325125010-123888543321 + k8s.io/client-go => k8s.io/client-go v0.0.0-20210325113035-53d96299a20a + k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210303091755-6539861c3c48 + k8s.io/component-base => k8s.io/component-base v0.0.0-20210325114608-ddffa36eac61 + k8s.io/metrics => k8s.io/metrics v0.0.0-20210325124441-1010cd41fb2e ) diff --git a/go.sum b/go.sum index 15bcf1728..c0d9d1cba 100644 --- a/go.sum +++ b/go.sum @@ -503,6 +503,12 @@ 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-20210325111313-83a267c7608c/go.mod h1:1DpU1b3N0Yzraj30FrBPrxCDWfvjktX1dY26K1fpHLQ= +k8s.io/apimachinery v0.0.0-20210325110524-6d69a3e60ee7/go.mod h1:VEnBy6MjLOiOk/toGgJUL7R55GwMclsrEL3UnsHfn5Y= +k8s.io/cli-runtime v0.0.0-20210325125010-123888543321/go.mod h1:AbvGWp7ab3OR8Hmqd0q9NYkhpJO7nYKpe3HRiBMa0tc= +k8s.io/client-go v0.0.0-20210325113035-53d96299a20a/go.mod h1:jF80L+0gFc/LFxW+CbF0qmk+PTY7fb31gEuT7CPnU68= +k8s.io/code-generator v0.0.0-20210303091755-6539861c3c48/go.mod h1:lwEq3YnLYb/7uVXLorOJfxg+cUu2oihFhHZ0n9NIla0= +k8s.io/component-base v0.0.0-20210325114608-ddffa36eac61/go.mod h1:AAd86bbPFMnq71YEpPsBoTZqUpZVY5z0nSzNhpsIS9I= 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= @@ -510,6 +516,7 @@ 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-20210325124441-1010cd41fb2e/go.mod h1:jwivTuwxYNa8IkrD9PfvH0+3GgE0p2eax0yBFNdYUMM= 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=