From 163af6a908acb8e7480fd61b59fc912b52712130 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 | 31 ++++++++++++++++--------------- go.sum | 7 ------- 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/go.mod b/go.mod index 852386fec..6ad180bed 100644 --- a/go.mod +++ b/go.mod @@ -36,14 +36,14 @@ require ( golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456 gopkg.in/yaml.v2 v2.2.4 gotest.tools v2.2.0+incompatible // indirect - k8s.io/api v0.0.0-20191114100040-7a2cb0978c84 - k8s.io/apimachinery v0.0.0-20191114135336-bcf004c497a4 - k8s.io/cli-runtime v0.0.0-20191114105952-7b87a9605630 - k8s.io/client-go v0.0.0-20191114100705-19241984841b - k8s.io/component-base v0.0.0-20191114102140-eea1fb8fb92a + k8s.io/api v0.0.0 + k8s.io/apimachinery v0.0.0 + k8s.io/cli-runtime v0.0.0 + k8s.io/client-go v0.0.0 + k8s.io/component-base v0.0.0 k8s.io/klog v1.0.0 k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a - k8s.io/metrics v0.0.0-20191109111301-80b462294217 + k8s.io/metrics v0.0.0 k8s.io/utils v0.0.0-20191030222137-2b95a09bc58d sigs.k8s.io/kustomize v2.0.3+incompatible sigs.k8s.io/yaml v1.1.0 @@ -51,13 +51,14 @@ require ( ) 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-20191114100040-7a2cb0978c84 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191114135336-bcf004c497a4 - k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20191114105952-7b87a9605630 - k8s.io/client-go => k8s.io/client-go v0.0.0-20191114100705-19241984841b - k8s.io/code-generator => k8s.io/code-generator v0.0.0-20191114135143-6adb5079a1c8 - k8s.io/component-base => k8s.io/component-base v0.0.0-20191114102140-eea1fb8fb92a - k8s.io/metrics => k8s.io/metrics v0.0.0-20191109111301-80b462294217 + 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/cli-runtime => ../cli-runtime + k8s.io/client-go => ../client-go + k8s.io/code-generator => ../code-generator + k8s.io/component-base => ../component-base + k8s.io/kubectl => ../kubectl + k8s.io/metrics => ../metrics ) diff --git a/go.sum b/go.sum index f1da4ee69..012c405cb 100644 --- a/go.sum +++ b/go.sum @@ -316,12 +316,6 @@ gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= 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-20191114100040-7a2cb0978c84/go.mod h1:MjrNYBNnG/Ssm58C6/dkiDlR3IKGALnvHdPe7FUSCZs= -k8s.io/apimachinery v0.0.0-20191114135336-bcf004c497a4/go.mod h1:+6CX7hP4aLfX2sb91JYDMIp0VqDSog2kZu0BHe+lP+s= -k8s.io/cli-runtime v0.0.0-20191114105952-7b87a9605630/go.mod h1:reOVNGV6gGhkgMHuJnmeiEqRL3z49lQEGo8E5CGlAic= -k8s.io/client-go v0.0.0-20191114100705-19241984841b/go.mod h1:KMu6hP5Br0jw+porL3eGkOag/Zwa7iZPHzsaHgzZmXo= -k8s.io/code-generator v0.0.0-20191114135143-6adb5079a1c8/go.mod h1:fRFrKVixH946mn5PeglV2fvxbE86JesGi16bsWZ1xz4= -k8s.io/component-base v0.0.0-20191114102140-eea1fb8fb92a/go.mod h1:KnwagkUxLG5qvuakxgWdrEN7cu5xkT0IdWI1ttPr9D0= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= @@ -330,7 +324,6 @@ k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8= k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a h1:UcxjrRMyNx/i/y8G7kPvLyy7rfbeuf1PYyBf973pgyU= k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E= -k8s.io/metrics v0.0.0-20191109111301-80b462294217/go.mod h1:GSVMuBbi34fc7MSnJ1Q//5ijIPF5ykXeEVQ49V5l2SM= k8s.io/utils v0.0.0-20191030222137-2b95a09bc58d h1:1P0iBJsBzxRmR+dIFnM+Iu4aLxnoa7lBqozW/0uHbT8= k8s.io/utils v0.0.0-20191030222137-2b95a09bc58d/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw=