kubernetes
/
kube-controller-manager
mirror of https://github.com/kubernetes/kube-controller-manager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #106660 from liggitt/smd-merge 

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

Kubernetes-commit: aff056d8a197f6a404ad5e02210ca662d16c3dbe
This commit is contained in:
Kubernetes Publisher 2021-11-24 13:37:31 -08:00
parent 50dbfde204
commit c2ec53a12a
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
go.mod
View File

@ -5,19 +5,18 @@ module k8s.io/kube-controller-manager
go 1.16
require (
k8s.io/apimachinery v0.0.0
k8s.io/cloud-provider v0.0.0
k8s.io/controller-manager v0.0.0
k8s.io/apimachinery v0.0.0-20211124232001-ffb9472ec51a
k8s.io/cloud-provider v0.0.0-20211124235533-5675546fef8e
k8s.io/controller-manager v0.0.0-20211124235410-07f7feed437b
)
replace (
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
k8s.io/api => k8s.io/api v0.0.0-20211124232210-4c321cf829a0
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211124232001-ffb9472ec51a
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20211124233600-cecf3a2e57ff
k8s.io/client-go => k8s.io/client-go v0.0.0-20211124232522-ad95a77727e6
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20211124235533-5675546fef8e
k8s.io/component-base => k8s.io/component-base v0.0.0-20211124233101-2083abd532f6
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20211124233219-ca823cbe37b0
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20211124235410-07f7feed437b
)

13
go.sum
View File

@ -855,6 +855,19 @@ 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-20211124232210-4c321cf829a0 h1:hTJnV20bAHUQZIzigjK3CvWqQuzeQP/C7AP72fzzEIo=
k8s.io/api v0.0.0-20211124232210-4c321cf829a0/go.mod h1:Iod80qmyxDiUr9X93OyKup/yGuYZGx8VK8nLuWpK9Yc=
k8s.io/apimachinery v0.0.0-20211124232001-ffb9472ec51a h1:IggksFfccO+DgJNByne5JOJ+jfqpcMZRsYkwYGZ6qkA=
k8s.io/apimachinery v0.0.0-20211124232001-ffb9472ec51a/go.mod h1:fFCTTBKvKcwTPFzjlcxp91uPFZr+JA0FubU4fLzzFYc=
k8s.io/apiserver v0.0.0-20211124233600-cecf3a2e57ff/go.mod h1:LQ4BfXqOOTPaOofdkOM72bC7Y6r9rpDGpY8P6dNtLYM=
k8s.io/client-go v0.0.0-20211124232522-ad95a77727e6/go.mod h1:OLO/3PqG5YcMPnn2OALBWiCvW3M/oEuV2hpW/SdUOQE=
k8s.io/cloud-provider v0.0.0-20211124235533-5675546fef8e h1:ewIcb6AgkZlg5QNR5tObA7V+z/m8nJMxFyfoeGiK8VY=
k8s.io/cloud-provider v0.0.0-20211124235533-5675546fef8e/go.mod h1:pKFgLBcfTZYA6bD45fjZztlygGTVaY25+aAoiUvKuGY=
k8s.io/component-base v0.0.0-20211124233101-2083abd532f6 h1:KNhcuiqzpRezT0T4DEHMn+z66atapTnrtI5abzZOC9g=
k8s.io/component-base v0.0.0-20211124233101-2083abd532f6/go.mod h1:inaqiw5wlT5ehYnh4g7i4YyyxIVUDQJ6BzoQplWtc2A=
k8s.io/component-helpers v0.0.0-20211124233219-ca823cbe37b0/go.mod h1:xzjFvbww9k3g+l38ZqevXEW4cmHNm8lWrhg1CWaSFnc=
k8s.io/controller-manager v0.0.0-20211124235410-07f7feed437b h1:V43kgwrq5C309/KzX36BCeBjc71GTkCC+C4KJ+l9Nl0=
k8s.io/controller-manager v0.0.0-20211124235410-07f7feed437b/go.mod h1:DmD0rHd9RL0xi9wH7EjPSpKuyItgsdQRVp3ZiQzMjyY=
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=