Update structured-merge-diff to v4.1.1

Kubernetes-commit: 5f1b146852124e6c5ebfc2b69aee7dfa4fe6d158
This commit is contained in:
Kevin Delgado 2021-04-02 17:42:54 +00:00 committed by Kubernetes Publisher
parent ff099890f2
commit 3e585ab929
2 changed files with 13 additions and 19 deletions

21
go.mod
View File

@ -5,17 +5,18 @@ module k8s.io/kube-controller-manager
go 1.16
require (
k8s.io/apimachinery v0.0.0-20210313025227-57f2a0733447
k8s.io/cloud-provider v0.0.0-20210313040742-5a236942a3ca
k8s.io/controller-manager v0.0.0-20210313040544-385c02a3964b
k8s.io/apimachinery v0.0.0
k8s.io/cloud-provider v0.0.0
k8s.io/controller-manager v0.0.0
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20210313025757-51a1c5553d68
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210313025227-57f2a0733447
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20210313032134-0eb3da2e7ac5
k8s.io/client-go => k8s.io/client-go v0.0.0-20210313030403-f6ce18ae578c
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20210313040742-5a236942a3ca
k8s.io/component-base => k8s.io/component-base v0.0.0-20210313031516-9f42c8df41b0
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20210313040544-385c02a3964b
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
)

11
go.sum
View File

@ -595,13 +595,6 @@ 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-20210313025757-51a1c5553d68/go.mod h1:7Byi1J8zhqxObDDyvyvJdvEZioXQZDTsNqSFMk4JMMM=
k8s.io/apimachinery v0.0.0-20210313025227-57f2a0733447/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY=
k8s.io/apiserver v0.0.0-20210313032134-0eb3da2e7ac5/go.mod h1:ptWyiOo6aPQUxwUTACseAy0LJHPE0I4uaVvxRoTcXvQ=
k8s.io/client-go v0.0.0-20210313030403-f6ce18ae578c/go.mod h1:4u6PvPJOUogAjcm6A0yv7SXKhoR4NQafsc4RuKbouZk=
k8s.io/cloud-provider v0.0.0-20210313040742-5a236942a3ca/go.mod h1:ZLD4P7ncFtRLur4jLmpLyYtOWCD8N4ZPfTZR2Dao6SY=
k8s.io/component-base v0.0.0-20210313031516-9f42c8df41b0/go.mod h1:xbfn3fkC6RSVPe1kpuRzmIvpCcq7C7TWSACOY1TfJZA=
k8s.io/controller-manager v0.0.0-20210313040544-385c02a3964b/go.mod h1:LG1QLCz0XIQCOIKrzaLG0YerVfwrj8KUaEWMMZB50js=
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.8.0 h1:Q3gmuM9hKEjefWFFYF0Mat+YyFJvsUyYuwyNNJ5C9Ts=
@ -614,8 +607,8 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
sigs.k8s.io/structured-merge-diff/v4 v4.1.0 h1:C4r9BgJ98vrKnnVCjwCSXcWjWe0NKcUQkmzDXZXGwH8=
sigs.k8s.io/structured-merge-diff/v4 v4.1.0/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
sigs.k8s.io/structured-merge-diff/v4 v4.1.1 h1:nYqY2A6oy37sKLYuSBXuQhbj4JVclzJK13BOIvJG5XU=
sigs.k8s.io/structured-merge-diff/v4 v4.1.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=