From b4ecf16d6e7cbb0c162d83224ad07ece5eb192c2 Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Tue, 12 Nov 2019 23:54:26 -0500 Subject: [PATCH] Add comments to explain golang.org replace directives Kubernetes-commit: 9f40e19d7ac9e2203c23814701468a26eee1964f --- go.mod | 17 +++++++++-------- go.sum | 4 ---- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index f1d5101..48d2a29 100644 --- a/go.mod +++ b/go.mod @@ -5,15 +5,16 @@ module k8s.io/kube-controller-manager go 1.12 require ( - k8s.io/apimachinery v0.0.0-20191109155659-ff79dfe72cae - k8s.io/component-base v0.0.0-20191109155659-a195ff441f6e + k8s.io/apimachinery v0.0.0 + k8s.io/component-base v0.0.0 ) replace ( - golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a - golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 - k8s.io/api => k8s.io/api v0.0.0-20191109155659-06f53b4b24f6 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191109155659-ff79dfe72cae - k8s.io/client-go => k8s.io/client-go v0.0.0-20191109155659-fcde0a10c837 - k8s.io/component-base => k8s.io/component-base v0.0.0-20191109155659-a195ff441f6e + golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13 + golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13 + k8s.io/api => ../api + k8s.io/apimachinery => ../apimachinery + k8s.io/client-go => ../client-go + k8s.io/component-base => ../component-base + k8s.io/kube-controller-manager => ../kube-controller-manager ) diff --git a/go.sum b/go.sum index 960ea22..9d8cb1b 100644 --- a/go.sum +++ b/go.sum @@ -186,10 +186,6 @@ gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -k8s.io/api v0.0.0-20191109155659-06f53b4b24f6/go.mod h1:vIkJ/W88qqsmwke+iDxmt9IJZKj9hb9gE0lg63KzphA= -k8s.io/apimachinery v0.0.0-20191109155659-ff79dfe72cae/go.mod h1:+6CX7hP4aLfX2sb91JYDMIp0VqDSog2kZu0BHe+lP+s= -k8s.io/client-go v0.0.0-20191109155659-fcde0a10c837/go.mod h1:dlBmDo0puNrkoXvixIOutlVJ+ukWbJSXmkKwF2UbQWE= -k8s.io/component-base v0.0.0-20191109155659-a195ff441f6e/go.mod h1:P81VeSClc7b/ja5Px/2gW9R2j2G/eHt7XeVykA7Vxt4= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=