add client-go as a dep of component-base

kubernetes · Aug 21, 2019 · 94b612f · 94b612f
1 parent 9309f16
commit 94b612f
Show file tree

Hide file tree

Showing 10 changed files with 130 additions and 0 deletions.
diff --git a/staging/publishing/import-restrictions.yaml b/staging/publishing/import-restrictions.yaml
@@ -56,6 +56,8 @@
   allowedImports:
   - k8s.io/apimachinery
   - k8s.io/component-base
+  - k8s.io/client-go
+  - k8s.io/client-go/tools/
   - k8s.io/klog
   - k8s.io/utils
 

diff --git a/staging/publishing/rules.yaml b/staging/publishing/rules.yaml
@@ -110,6 +110,10 @@ rules:
     dependencies:
     - repository: apimachinery
       branch: master
+    - repository: api
+      branch: master
+    - repository: client-go
+      branch: master
   - source:
       branch: release-1.15
       dir: staging/src/k8s.io/component-base
@@ -540,6 +544,10 @@ rules:
       branch: master
     - repository: component-base
       branch: master
+    - repository: api
+      branch: master
+    - repository: client-go
+      branch: master
   - source:
       branch: release-1.15
       dir: staging/src/k8s.io/kube-proxy
@@ -604,6 +612,10 @@ rules:
       branch: master
     - repository: component-base
       branch: master
+    - repository: api
+      branch: master
+    - repository: client-go
+      branch: master
   - source:
       branch: release-1.15
       dir: staging/src/k8s.io/kube-scheduler
@@ -636,6 +648,10 @@ rules:
       branch: master
     - repository: component-base
       branch: master
+    - repository: api
+      branch: master
+    - repository: client-go
+      branch: master
   - source:
       branch: release-1.15
       dir: staging/src/k8s.io/kube-controller-manager

diff --git a/staging/src/k8s.io/component-base/go.mod b/staging/src/k8s.io/component-base/go.mod
@@ -13,14 +13,18 @@ require (
 	github.com/spf13/pflag v1.0.3
 	github.com/stretchr/testify v1.3.0
 	k8s.io/apimachinery v0.0.0
+	k8s.io/client-go v0.0.0
 	k8s.io/klog v0.4.0
 	k8s.io/utils v0.0.0-20190801114015-581e00157fb1
 )
 
 replace (
+	golang.org/x/crypto => golang.org/x/crypto v0.0.0-20181025213731-e84da0312774
 	golang.org/x/sync => golang.org/x/sync v0.0.0-20181108010431-42b317875d0f
 	golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503
 	golang.org/x/text => golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db
+	k8s.io/api => ../api
 	k8s.io/apimachinery => ../apimachinery
+	k8s.io/client-go => ../client-go
 	k8s.io/component-base => ../component-base
 )
diff --git a/staging/src/k8s.io/component-base/go.sum b/staging/src/k8s.io/component-base/go.sum
diff --git a/staging/src/k8s.io/kube-controller-manager/go.mod b/staging/src/k8s.io/kube-controller-manager/go.mod
@@ -10,10 +10,13 @@ require (
 )
 
 replace (
+	golang.org/x/crypto => golang.org/x/crypto v0.0.0-20181025213731-e84da0312774
 	golang.org/x/sync => golang.org/x/sync v0.0.0-20181108010431-42b317875d0f
 	golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503
 	golang.org/x/text => golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db
+	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
 )