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 #72569 from luxas/component_base_init 

Create the k8s.io/component-base staging repo

Kubernetes-commit: 1b28775db1290a772967d192a19a8ec447053cd5
This commit is contained in:
Kubernetes Publisher 2019-01-08 03:18:35 -08:00
parent 10c3678c6b 6ff948a21c
commit 23ab32967a
2 changed files with 29 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
Godeps/Godeps.json generated
View File

@ -56,103 +56,95 @@
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/resource", "ImportPath": "k8s.io/apimachinery/pkg/api/resource",
"Rev": "0cd393178e09f379032a493f73993dc600e1959d" "Rev": "e086bfc51e5473a823963a7dd224934d6f3767e7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/config",
"Rev": "0cd393178e09f379032a493f73993dc600e1959d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/config/v1alpha1",
"Rev": "0cd393178e09f379032a493f73993dc600e1959d"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
"Rev": "0cd393178e09f379032a493f73993dc600e1959d" "Rev": "e086bfc51e5473a823963a7dd224934d6f3767e7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/conversion", "ImportPath": "k8s.io/apimachinery/pkg/conversion",
"Rev": "0cd393178e09f379032a493f73993dc600e1959d" "Rev": "e086bfc51e5473a823963a7dd224934d6f3767e7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams", "ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
"Rev": "0cd393178e09f379032a493f73993dc600e1959d" "Rev": "e086bfc51e5473a823963a7dd224934d6f3767e7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/fields", "ImportPath": "k8s.io/apimachinery/pkg/fields",
"Rev": "0cd393178e09f379032a493f73993dc600e1959d" "Rev": "e086bfc51e5473a823963a7dd224934d6f3767e7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/labels", "ImportPath": "k8s.io/apimachinery/pkg/labels",
"Rev": "0cd393178e09f379032a493f73993dc600e1959d" "Rev": "e086bfc51e5473a823963a7dd224934d6f3767e7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime", "ImportPath": "k8s.io/apimachinery/pkg/runtime",
"Rev": "0cd393178e09f379032a493f73993dc600e1959d" "Rev": "e086bfc51e5473a823963a7dd224934d6f3767e7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema", "ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
"Rev": "0cd393178e09f379032a493f73993dc600e1959d" "Rev": "e086bfc51e5473a823963a7dd224934d6f3767e7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/selection", "ImportPath": "k8s.io/apimachinery/pkg/selection",
"Rev": "0cd393178e09f379032a493f73993dc600e1959d" "Rev": "e086bfc51e5473a823963a7dd224934d6f3767e7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/types", "ImportPath": "k8s.io/apimachinery/pkg/types",
"Rev": "0cd393178e09f379032a493f73993dc600e1959d" "Rev": "e086bfc51e5473a823963a7dd224934d6f3767e7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/errors", "ImportPath": "k8s.io/apimachinery/pkg/util/errors",
"Rev": "0cd393178e09f379032a493f73993dc600e1959d" "Rev": "e086bfc51e5473a823963a7dd224934d6f3767e7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/intstr", "ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
"Rev": "0cd393178e09f379032a493f73993dc600e1959d" "Rev": "e086bfc51e5473a823963a7dd224934d6f3767e7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/json", "ImportPath": "k8s.io/apimachinery/pkg/util/json",
"Rev": "0cd393178e09f379032a493f73993dc600e1959d" "Rev": "e086bfc51e5473a823963a7dd224934d6f3767e7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/naming", "ImportPath": "k8s.io/apimachinery/pkg/util/naming",
"Rev": "0cd393178e09f379032a493f73993dc600e1959d" "Rev": "e086bfc51e5473a823963a7dd224934d6f3767e7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/net", "ImportPath": "k8s.io/apimachinery/pkg/util/net",
"Rev": "0cd393178e09f379032a493f73993dc600e1959d" "Rev": "e086bfc51e5473a823963a7dd224934d6f3767e7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/runtime", "ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
"Rev": "0cd393178e09f379032a493f73993dc600e1959d" "Rev": "e086bfc51e5473a823963a7dd224934d6f3767e7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/sets", "ImportPath": "k8s.io/apimachinery/pkg/util/sets",
"Rev": "0cd393178e09f379032a493f73993dc600e1959d" "Rev": "e086bfc51e5473a823963a7dd224934d6f3767e7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/validation", "ImportPath": "k8s.io/apimachinery/pkg/util/validation",
"Rev": "0cd393178e09f379032a493f73993dc600e1959d" "Rev": "e086bfc51e5473a823963a7dd224934d6f3767e7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field", "ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
"Rev": "0cd393178e09f379032a493f73993dc600e1959d" "Rev": "e086bfc51e5473a823963a7dd224934d6f3767e7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/watch", "ImportPath": "k8s.io/apimachinery/pkg/watch",
"Rev": "0cd393178e09f379032a493f73993dc600e1959d" "Rev": "e086bfc51e5473a823963a7dd224934d6f3767e7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect", "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
"Rev": "0cd393178e09f379032a493f73993dc600e1959d" "Rev": "e086bfc51e5473a823963a7dd224934d6f3767e7"
}, },
{ {
"ImportPath": "k8s.io/apiserver/pkg/apis/config", "ImportPath": "k8s.io/component-base/config",
"Rev": "fdeb778d731fc8996a43faf969587f98529c8c0b" "Rev": "939a2693e908cbb76bd0dc26f3c376280816f218"
}, },
{ {
"ImportPath": "k8s.io/apiserver/pkg/apis/config/v1alpha1", "ImportPath": "k8s.io/component-base/config/v1alpha1",
"Rev": "fdeb778d731fc8996a43faf969587f98529c8c0b" "Rev": "939a2693e908cbb76bd0dc26f3c376280816f218"
}, },
{ {
"ImportPath": "k8s.io/klog", "ImportPath": "k8s.io/klog",

9
config/v1alpha1/types.go
View File

@ -17,9 +17,8 @@ limitations under the License.
package v1alpha1 package v1alpha1
import ( import (
apimachineryconfigv1alpha1 "k8s.io/apimachinery/pkg/apis/config/v1alpha1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
apiserverconfigv1alpha1 "k8s.io/apiserver/pkg/apis/config/v1alpha1" componentbaseconfigv1alpha1 "k8s.io/component-base/config/v1alpha1"
) )
// PersistentVolumeRecyclerConfiguration contains elements describing persistent volume plugins. // PersistentVolumeRecyclerConfiguration contains elements describing persistent volume plugins.
@ -161,11 +160,11 @@ type GenericControllerManagerConfiguration struct {
MinResyncPeriod metav1.Duration MinResyncPeriod metav1.Duration
// ClientConnection specifies the kubeconfig file and client connection // ClientConnection specifies the kubeconfig file and client connection
// settings for the proxy server to use when communicating with the apiserver. // settings for the proxy server to use when communicating with the apiserver.
ClientConnection apimachineryconfigv1alpha1.ClientConnectionConfiguration ClientConnection componentbaseconfigv1alpha1.ClientConnectionConfiguration
// How long to wait between starting controller managers // How long to wait between starting controller managers
ControllerStartInterval metav1.Duration ControllerStartInterval metav1.Duration
// leaderElection defines the configuration of leader election client. // leaderElection defines the configuration of leader election client.
LeaderElection apiserverconfigv1alpha1.LeaderElectionConfiguration LeaderElection componentbaseconfigv1alpha1.LeaderElectionConfiguration
// Controllers is the list of controllers to enable or disable // Controllers is the list of controllers to enable or disable
// '*' means "all enabled by default controllers" // '*' means "all enabled by default controllers"
// 'foo' means "enable 'foo'" // 'foo' means "enable 'foo'"
@ -173,7 +172,7 @@ type GenericControllerManagerConfiguration struct {
// first item for a particular name wins // first item for a particular name wins
Controllers []string Controllers []string
// DebuggingConfiguration holds configuration for Debugging related features. // DebuggingConfiguration holds configuration for Debugging related features.
Debugging apiserverconfigv1alpha1.DebuggingConfiguration Debugging componentbaseconfigv1alpha1.DebuggingConfiguration
} }
// KubeCloudSharedConfiguration contains elements shared by both kube-controller manager // KubeCloudSharedConfiguration contains elements shared by both kube-controller manager