Revert sigs.k8s.io/structured-merge-diff/v4 to v4.1.2

Kubernetes-commit: ed68909177eca588731bc153d2f69dd235e8fe10
This commit is contained in:
Jordan Liggitt 2021-11-24 10:32:24 -05:00 committed by Kubernetes Publisher
parent a47f319fe4
commit 50dbfde204
2 changed files with 14 additions and 26 deletions

23
go.mod
View File

@ -5,18 +5,19 @@ module k8s.io/kube-controller-manager
go 1.16
require (
k8s.io/apimachinery v0.0.0-20211117031931-f3cf56ed60da
k8s.io/cloud-provider v0.0.0-20211117035717-7b0f63887cec
k8s.io/controller-manager v0.0.0-20211117035547-a185b3f536f2
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-20211117032144-b7adf12040d3
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211117031931-f3cf56ed60da
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20211117033540-e7910294baa9
k8s.io/client-go => k8s.io/client-go v0.0.0-20211117032455-e2c9d634d6ba
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20211117035717-7b0f63887cec
k8s.io/component-base => k8s.io/component-base v0.0.0-20211117033035-2a12018533a2
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20211117033155-b70f8e754916
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20211117035547-a185b3f536f2
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/component-helpers => ../component-helpers
k8s.io/controller-manager => ../controller-manager
k8s.io/kube-controller-manager => ../kube-controller-manager
)

17
go.sum
View File

@ -855,19 +855,6 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
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=
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20211117032144-b7adf12040d3 h1:OUKo3mc2wSOr2GGk0MiMWhZOca1INVHD0Ol0zHOmlKU=
k8s.io/api v0.0.0-20211117032144-b7adf12040d3/go.mod h1:B1McGV/Uyv/c0sGZKsHMP4FArbyZZ8Emx+a7h5d/tMs=
k8s.io/apimachinery v0.0.0-20211117031931-f3cf56ed60da h1:7W2cMPNnhm4snbd4zGcOBzi233V4+x1jHHeDq2Fr/nE=
k8s.io/apimachinery v0.0.0-20211117031931-f3cf56ed60da/go.mod h1:SqloDTPqePPNhEp8K4qUgqpKc3tE+ymn05iIUbSAQ7g=
k8s.io/apiserver v0.0.0-20211117033540-e7910294baa9/go.mod h1:STjQuxCQ7a7gCLnhORrL235jEo82xEvpRrx+EMrtwUI=
k8s.io/client-go v0.0.0-20211117032455-e2c9d634d6ba/go.mod h1:/6rSxWdcMfCPQ+BnsLCvWe5BDUArFuNGE4x2m7q2zqc=
k8s.io/cloud-provider v0.0.0-20211117035717-7b0f63887cec h1:rwC9n1QTT6bNDMxp8vVt1Gt7pPQMG19Dbj942zSKRyI=
k8s.io/cloud-provider v0.0.0-20211117035717-7b0f63887cec/go.mod h1:8z+U0pJyhpdxeDu0Fko1L6hXmrtvjPuFwRqOUGk5F0U=
k8s.io/component-base v0.0.0-20211117033035-2a12018533a2 h1:Eq5F+Yl0w7BUS2I1rrij995N9L/QaHUuv+wmjCNy1jQ=
k8s.io/component-base v0.0.0-20211117033035-2a12018533a2/go.mod h1:M8S6yaytGn7h1Xxa64Mk0MrYcKPEDf2R1ynxXfbUKDM=
k8s.io/component-helpers v0.0.0-20211117033155-b70f8e754916/go.mod h1:Mupxky2BdZz11gPnA0/inwT4SEY9Y7P5PAOOBHQCWa4=
k8s.io/controller-manager v0.0.0-20211117035547-a185b3f536f2 h1:6SbN/Q+wJfEpbL8PnskcD4jvP2OV61oNNomHblhPhws=
k8s.io/controller-manager v0.0.0-20211117035547-a185b3f536f2/go.mod h1:qxdKPI3iGfwG7UVDyrSHJtXNEhHrr3lQEfMGYWIzVAc=
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
@ -884,7 +871,7 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.25/go.mod h1:Mlj9PN
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 h1:fD1pz4yfdADVNfFmcP2aBEtudwUQ1AlLnRBALr33v3s=
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNzagwnNoseA6OxSUutVw05NhYDRs=
sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
sigs.k8s.io/structured-merge-diff/v4 v4.2.0 h1:kDvPBbnPk+qYmkHmSo8vKGp438IASWofnbbUKDE/bv0=
sigs.k8s.io/structured-merge-diff/v4 v4.2.0/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4=
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 h1:Hr/htKFmJEbtMgS/UD0N+gtgctAqz81t3nu+sPzynno=
sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4=
sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=