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 #96399 from andrewsykim/service-config 

move service controller config to k8s.io/cloud-provider/controllers/service/config

Kubernetes-commit: e38b1b94f83c5049b77cf4d343530f075f68a0fb
This commit is contained in:
Kubernetes Publisher 2020-11-12 11:21:57 -08:00
parent c5b5357d3f 25018199bf
commit 9a86aa4606
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Godeps/Godeps.json generated
View File

@ -920,7 +920,7 @@
}, },
{ {
"ImportPath": "k8s.io/cloud-provider", "ImportPath": "k8s.io/cloud-provider",
"Rev": "98481d6613cd" "Rev": "84729526206b"
}, },
{ {
"ImportPath": "k8s.io/component-base", "ImportPath": "k8s.io/component-base",

2
config/v1alpha1/types.go
View File

@ -19,7 +19,7 @@ package v1alpha1
import ( import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
cpconfigv1alpha1 "k8s.io/cloud-provider/config/v1alpha1" cpconfigv1alpha1 "k8s.io/cloud-provider/config/v1alpha1"
serviceconfigv1alpha1 "k8s.io/cloud-provider/service/config/v1alpha1" serviceconfigv1alpha1 "k8s.io/cloud-provider/controllers/service/config/v1alpha1"
cmconfigv1alpha1 "k8s.io/controller-manager/config/v1alpha1" cmconfigv1alpha1 "k8s.io/controller-manager/config/v1alpha1"
) )

4
go.mod
View File

@ -6,7 +6,7 @@ go 1.15
require ( require (
k8s.io/apimachinery v0.0.0-20201112162105-000b5f4f8623 k8s.io/apimachinery v0.0.0-20201112162105-000b5f4f8623
k8s.io/cloud-provider v0.0.0-20201112205001-98481d6613cd k8s.io/cloud-provider v0.0.0-20201112205004-84729526206b
k8s.io/controller-manager v0.0.0-20201112204858-db8302bd10e3 k8s.io/controller-manager v0.0.0-20201112204858-db8302bd10e3
) )
@ -15,7 +15,7 @@ replace (
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20201112162105-000b5f4f8623 k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20201112162105-000b5f4f8623
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20201112203353-7490b8bcb0d4 k8s.io/apiserver => k8s.io/apiserver v0.0.0-20201112203353-7490b8bcb0d4
k8s.io/client-go => k8s.io/client-go v0.0.0-20201112202528-30548acd0a9e k8s.io/client-go => k8s.io/client-go v0.0.0-20201112202528-30548acd0a9e
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20201112205001-98481d6613cd k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20201112205004-84729526206b
k8s.io/component-base => k8s.io/component-base v0.0.0-20201112203007-ae492f5f42a5 k8s.io/component-base => k8s.io/component-base v0.0.0-20201112203007-ae492f5f42a5
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20201112204858-db8302bd10e3 k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20201112204858-db8302bd10e3
) )

2
go.sum
View File

@ -571,7 +571,7 @@ k8s.io/api v0.0.0-20201112122247-88ad409c1fcc/go.mod h1:kdpOjtJg1fLz8kIoeBe0Ohm3
k8s.io/apimachinery v0.0.0-20201112162105-000b5f4f8623/go.mod h1:C4HVOTZCaKwcNDaxwQoXe3Zk6BLT5jNivqfdcniEtuY= k8s.io/apimachinery v0.0.0-20201112162105-000b5f4f8623/go.mod h1:C4HVOTZCaKwcNDaxwQoXe3Zk6BLT5jNivqfdcniEtuY=
k8s.io/apiserver v0.0.0-20201112203353-7490b8bcb0d4/go.mod h1:qNm5TuBEI/LE0Ip+jHpZ98ETEJx67wvZ+muLdl6gRYE= k8s.io/apiserver v0.0.0-20201112203353-7490b8bcb0d4/go.mod h1:qNm5TuBEI/LE0Ip+jHpZ98ETEJx67wvZ+muLdl6gRYE=
k8s.io/client-go v0.0.0-20201112202528-30548acd0a9e/go.mod h1:KkY4/tSKSJeHkCItTqOpUcLiN4HNZDViOeW+hKwhU3k= k8s.io/client-go v0.0.0-20201112202528-30548acd0a9e/go.mod h1:KkY4/tSKSJeHkCItTqOpUcLiN4HNZDViOeW+hKwhU3k=
k8s.io/cloud-provider v0.0.0-20201112205001-98481d6613cd/go.mod h1:qHpUHTbyWEpfvviQNrXemJMVNsvGC/BsLgJsXyY7AqY= k8s.io/cloud-provider v0.0.0-20201112205004-84729526206b/go.mod h1:qHpUHTbyWEpfvviQNrXemJMVNsvGC/BsLgJsXyY7AqY=
k8s.io/component-base v0.0.0-20201112203007-ae492f5f42a5/go.mod h1:14mkjKSFTAbv3VSE9yKVLJQUMKinZk2qxnjlvD6D4AE= k8s.io/component-base v0.0.0-20201112203007-ae492f5f42a5/go.mod h1:14mkjKSFTAbv3VSE9yKVLJQUMKinZk2qxnjlvD6D4AE=
k8s.io/controller-manager v0.0.0-20201112204858-db8302bd10e3/go.mod h1:XLZR9Ff9Jjh0WS5sAaer8WSaLxnY3VsjOEb7bsMzOvI= k8s.io/controller-manager v0.0.0-20201112204858-db8302bd10e3/go.mod h1:XLZR9Ff9Jjh0WS5sAaer8WSaLxnY3VsjOEb7bsMzOvI=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=