From 821912a75198f0d516fc2744bed335afac8034e9 Mon Sep 17 00:00:00 2001 From: Jiahui Feng Date: Fri, 14 Jan 2022 10:30:23 -0800 Subject: [PATCH] upgrade sigs.k8s.io/structured-merge-diff/v4 to v4.2.1 --- go.mod | 4 ++-- staging/src/k8s.io/apiextensions-apiserver/go.mod | 2 +- staging/src/k8s.io/apimachinery/go.mod | 2 +- staging/src/k8s.io/apiserver/go.mod | 2 +- staging/src/k8s.io/client-go/go.mod | 2 +- staging/src/k8s.io/code-generator/go.mod | 2 +- staging/src/k8s.io/kube-aggregator/go.mod | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index c33fcc54f96..80511946fac 100644 --- a/go.mod +++ b/go.mod @@ -133,7 +133,7 @@ require ( k8s.io/sample-apiserver v0.0.0 k8s.io/system-validators v1.6.0 k8s.io/utils v0.0.0-20211208161948-7d6a63dca704 - sigs.k8s.io/structured-merge-diff/v4 v4.1.2 + sigs.k8s.io/structured-merge-diff/v4 v4.2.1 sigs.k8s.io/yaml v1.2.0 ) @@ -529,6 +529,6 @@ replace ( sigs.k8s.io/kustomize/cmd/config => sigs.k8s.io/kustomize/cmd/config v0.10.2 sigs.k8s.io/kustomize/kustomize/v4 => sigs.k8s.io/kustomize/kustomize/v4 v4.4.1 sigs.k8s.io/kustomize/kyaml => sigs.k8s.io/kustomize/kyaml v0.13.0 - sigs.k8s.io/structured-merge-diff/v4 => sigs.k8s.io/structured-merge-diff/v4 v4.1.2 + sigs.k8s.io/structured-merge-diff/v4 => sigs.k8s.io/structured-merge-diff/v4 v4.2.1 sigs.k8s.io/yaml => sigs.k8s.io/yaml v1.2.0 ) diff --git a/staging/src/k8s.io/apiextensions-apiserver/go.mod b/staging/src/k8s.io/apiextensions-apiserver/go.mod index af9ab5f748a..b81adf5b3ba 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/go.mod +++ b/staging/src/k8s.io/apiextensions-apiserver/go.mod @@ -30,7 +30,7 @@ require ( k8s.io/klog/v2 v2.40.1 k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 k8s.io/utils v0.0.0-20211208161948-7d6a63dca704 - sigs.k8s.io/structured-merge-diff/v4 v4.1.2 + sigs.k8s.io/structured-merge-diff/v4 v4.2.1 sigs.k8s.io/yaml v1.2.0 ) diff --git a/staging/src/k8s.io/apimachinery/go.mod b/staging/src/k8s.io/apimachinery/go.mod index fbc41ea76df..7c3518e461f 100644 --- a/staging/src/k8s.io/apimachinery/go.mod +++ b/staging/src/k8s.io/apimachinery/go.mod @@ -33,7 +33,7 @@ require ( k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 k8s.io/utils v0.0.0-20211208161948-7d6a63dca704 sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 - sigs.k8s.io/structured-merge-diff/v4 v4.1.2 + sigs.k8s.io/structured-merge-diff/v4 v4.2.1 sigs.k8s.io/yaml v1.2.0 ) diff --git a/staging/src/k8s.io/apiserver/go.mod b/staging/src/k8s.io/apiserver/go.mod index ac331e435c1..5ff303da111 100644 --- a/staging/src/k8s.io/apiserver/go.mod +++ b/staging/src/k8s.io/apiserver/go.mod @@ -52,7 +52,7 @@ require ( k8s.io/utils v0.0.0-20211208161948-7d6a63dca704 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.27 sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 - sigs.k8s.io/structured-merge-diff/v4 v4.1.2 + sigs.k8s.io/structured-merge-diff/v4 v4.2.1 sigs.k8s.io/yaml v1.2.0 ) diff --git a/staging/src/k8s.io/client-go/go.mod b/staging/src/k8s.io/client-go/go.mod index 06b045eace1..04d78daee58 100644 --- a/staging/src/k8s.io/client-go/go.mod +++ b/staging/src/k8s.io/client-go/go.mod @@ -35,7 +35,7 @@ require ( k8s.io/klog/v2 v2.40.1 k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 k8s.io/utils v0.0.0-20211208161948-7d6a63dca704 - sigs.k8s.io/structured-merge-diff/v4 v4.1.2 + sigs.k8s.io/structured-merge-diff/v4 v4.2.1 sigs.k8s.io/yaml v1.2.0 ) diff --git a/staging/src/k8s.io/code-generator/go.mod b/staging/src/k8s.io/code-generator/go.mod index 3b116a2f4cb..9bd1b429fcf 100644 --- a/staging/src/k8s.io/code-generator/go.mod +++ b/staging/src/k8s.io/code-generator/go.mod @@ -20,7 +20,7 @@ require ( k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 k8s.io/klog/v2 v2.40.1 k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 - sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect ) replace k8s.io/code-generator => ../code-generator diff --git a/staging/src/k8s.io/kube-aggregator/go.mod b/staging/src/k8s.io/kube-aggregator/go.mod index 72f0878bc51..2df69a17794 100644 --- a/staging/src/k8s.io/kube-aggregator/go.mod +++ b/staging/src/k8s.io/kube-aggregator/go.mod @@ -21,7 +21,7 @@ require ( k8s.io/klog/v2 v2.40.1 k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 k8s.io/utils v0.0.0-20211208161948-7d6a63dca704 - sigs.k8s.io/structured-merge-diff/v4 v4.1.2 + sigs.k8s.io/structured-merge-diff/v4 v4.2.1 ) replace (