Permalink
Browse files

Merge remote-tracking branch 'origin/master' into release-1.12

  • Loading branch information...
dougm committed Sep 4, 2018
2 parents 4d9bb04 + be11540 commit 553515b823634919e731774556fae554c95a6a5f
Showing with 8,784 additions and 4,882 deletions.
  1. +103 −102 api/api-rules/violation_exceptions.list
  2. +5 −1 api/openapi-spec/swagger.json
  3. +5 −1 api/swagger-spec/v1.json
  4. +6 −0 cluster/gce/gci/configure-helper.sh
  5. +1 −1 cmd/controller-manager/app/options/BUILD
  6. +2 −2 cmd/controller-manager/app/options/cloudprovider.go
  7. +3 −3 cmd/controller-manager/app/options/generic.go
  8. +3 −3 cmd/controller-manager/app/options/kubecloudshared.go
  9. +2 −2 cmd/controller-manager/app/options/servicecontroller.go
  10. +1 −1 cmd/kube-controller-manager/app/BUILD
  11. +1 −1 cmd/kube-controller-manager/app/autoscaling.go
  12. +1 −1 cmd/kube-controller-manager/app/config/BUILD
  13. +2 −2 cmd/kube-controller-manager/app/config/config.go
  14. +2 −2 cmd/kube-controller-manager/app/controllermanager.go
  15. +4 −3 cmd/kube-controller-manager/app/options/BUILD
  16. +2 −2 cmd/kube-controller-manager/app/options/attachdetachcontroller.go
  17. +2 −2 cmd/kube-controller-manager/app/options/csrsigningcontroller.go
  18. +2 −2 cmd/kube-controller-manager/app/options/daemonsetcontroller.go
  19. +2 −2 cmd/kube-controller-manager/app/options/deploymentcontroller.go
  20. +3 −3 cmd/kube-controller-manager/app/options/deprecatedcontroller.go
  21. +2 −2 cmd/kube-controller-manager/app/options/endpointcontroller.go
  22. +3 −3 cmd/kube-controller-manager/app/options/garbagecollectorcontroller.go
  23. +14 −10 cmd/kube-controller-manager/app/options/hpacontroller.go
  24. +2 −2 cmd/kube-controller-manager/app/options/jobcontroller.go
  25. +2 −2 cmd/kube-controller-manager/app/options/namespacecontroller.go
  26. +2 −2 cmd/kube-controller-manager/app/options/nodeipamcontroller.go
  27. +2 −2 cmd/kube-controller-manager/app/options/nodelifecyclecontroller.go
  28. +20 −18 cmd/kube-controller-manager/app/options/options.go
  29. +14 −12 cmd/kube-controller-manager/app/options/options_test.go
  30. +3 −3 cmd/kube-controller-manager/app/options/persistentvolumebindercontroller.go
  31. +2 −2 cmd/kube-controller-manager/app/options/podgccontroller.go
  32. +2 −2 cmd/kube-controller-manager/app/options/replicasetcontroller.go
  33. +2 −2 cmd/kube-controller-manager/app/options/replicationcontroller.go
  34. +2 −2 cmd/kube-controller-manager/app/options/resourcequotacontroller.go
  35. +2 −2 cmd/kube-controller-manager/app/options/serviceaccountcontroller.go
  36. +8 −8 cmd/kube-controller-manager/app/plugins.go
  37. +3 −0 cmd/kube-scheduler/app/options/BUILD
  38. +7 −5 cmd/kube-scheduler/app/options/deprecated.go
  39. +55 −0 cmd/kube-scheduler/app/options/deprecated_test.go
  40. +4 −0 cmd/kube-scheduler/app/options/options.go
  41. +40 −35 cmd/kubeadm/app/cmd/join.go
  42. +1 −1 cmd/kubeadm/app/cmd/upgrade/common.go
  43. +1 −10 cmd/kubeadm/app/cmd/upgrade/node.go
  44. +12 −1 cmd/kubeadm/app/componentconfigs/BUILD
  45. +80 −0 cmd/kubeadm/app/componentconfigs/config.go
  46. +146 −0 cmd/kubeadm/app/componentconfigs/config_test.go
  47. +15 −2 cmd/kubeadm/app/componentconfigs/registrations.go
  48. +22 −4 cmd/kubeadm/app/constants/constants.go
  49. +1 −0 cmd/kubeadm/app/phases/addons/proxy/BUILD
  50. +4 −4 cmd/kubeadm/app/phases/addons/proxy/manifests.go
  51. +48 −7 cmd/kubeadm/app/phases/addons/proxy/proxy.go
  52. +9 −5 cmd/kubeadm/app/phases/addons/proxy/proxy_test.go
  53. +1 −1 cmd/kubeadm/app/phases/kubeconfig/kubeconfig.go
  54. +1 −1 cmd/kubeadm/app/phases/kubeconfig/kubeconfig_test.go
  55. +3 −8 cmd/kubeadm/app/phases/kubelet/config.go
  56. +1 −1 cmd/kubeadm/app/phases/kubelet/dynamic.go
  57. +6 −0 cmd/kubeadm/app/phases/uploadconfig/BUILD
  58. +51 −12 cmd/kubeadm/app/phases/uploadconfig/uploadconfig.go
  59. +84 −2 cmd/kubeadm/app/phases/uploadconfig/uploadconfig_test.go
  60. +3 −1 cmd/kubeadm/app/util/config/BUILD
  61. +207 −23 cmd/kubeadm/app/util/config/cluster.go
  62. +605 −121 cmd/kubeadm/app/util/config/cluster_test.go
  63. +16 −2 cmd/kubeadm/app/util/config/masterconfig.go
  64. +3 −1 cmd/kubeadm/app/util/endpoint.go
  65. +8 −1 docs/api-reference/v1/definitions.html
  66. +1 −0 hack/.golint_failures
  67. +1 −2 pkg/apis/componentconfig/BUILD
  68. +4 −392 pkg/apis/componentconfig/types.go
  69. +2 −3 pkg/apis/componentconfig/v1alpha1/BUILD
  70. +3 −187 pkg/apis/componentconfig/v1alpha1/defaults.go
  71. +7 −7 pkg/apis/componentconfig/v1alpha1/defaults_test.go
  72. +1 −0 pkg/apis/componentconfig/v1alpha1/doc.go
  73. +4 −392 pkg/apis/componentconfig/v1alpha1/types.go
  74. +7 −1,075 pkg/apis/componentconfig/v1alpha1/zz_generated.conversion.go
  75. +0 −511 pkg/apis/componentconfig/v1alpha1/zz_generated.deepcopy.go
  76. +3 −13 pkg/apis/componentconfig/v1alpha1/zz_generated.defaults.go
  77. +0 −481 pkg/apis/componentconfig/zz_generated.deepcopy.go
  78. +7 −3 pkg/apis/core/types.go
  79. +2 −0 pkg/apis/core/v1/zz_generated.conversion.go
  80. +6 −1 pkg/apis/core/zz_generated.deepcopy.go
  81. +6 −1 pkg/cloudprovider/providers/azure/azure_backoff.go
  82. +96 −91 pkg/cloudprovider/providers/azure/azure_loadbalancer.go
  83. +32 −16 pkg/cloudprovider/providers/gce/gce.go
  84. +31 −6 pkg/cloudprovider/providers/gce/gce_clusters.go
  85. +5 −2 pkg/cloudprovider/providers/openstack/openstack_loadbalancer.go
  86. +1 −0 pkg/controller/BUILD
  87. +38 −0 pkg/controller/apis/config/BUILD
  88. +14 −0 pkg/controller/apis/config/OWNERS
  89. +19 −0 pkg/controller/apis/config/doc.go
  90. +43 −0 pkg/controller/apis/config/register.go
  91. +29 −0 pkg/controller/apis/config/scheme/BUILD
  92. +44 −0 pkg/controller/apis/config/scheme/scheme.go
  93. +440 −0 pkg/controller/apis/config/types.go
  94. +52 −0 pkg/controller/apis/config/v1alpha1/BUILD
  95. +60 −0 pkg/controller/apis/config/v1alpha1/conversion.go
  96. +267 −0 pkg/controller/apis/config/v1alpha1/defaults.go
  97. +64 −0 pkg/controller/apis/config/v1alpha1/defaults_test.go
  98. +23 −0 pkg/controller/apis/config/v1alpha1/doc.go
  99. +40 −0 pkg/controller/apis/config/v1alpha1/register.go
  100. +1,109 −0 pkg/controller/apis/config/v1alpha1/zz_generated.conversion.go
  101. +57 −0 pkg/controller/apis/config/v1alpha1/zz_generated.defaults.go
  102. +507 −0 pkg/controller/apis/config/zz_generated.deepcopy.go
  103. +3 −2 pkg/controller/nodeipam/ipam/cloud_cidr_allocator.go
  104. +5 −1 pkg/controller/nodeipam/ipam/cloud_cidr_allocator_test.go
  105. +1 −0 pkg/controller/podautoscaler/BUILD
  106. +56 −55 pkg/controller/podautoscaler/horizontal.go
  107. +98 −8 pkg/controller/podautoscaler/horizontal_test.go
  108. +2 −2 pkg/controller/podautoscaler/legacy_horizontal_test.go
  109. +1 −0 pkg/generated/openapi/BUILD
  110. +1 −0 pkg/kubectl/BUILD
  111. +7 −0 pkg/kubectl/cmd/rollout/BUILD
  112. +72 −42 pkg/kubectl/cmd/rollout/rollout_status.go
  113. +7 −0 pkg/kubectl/cmd/run.go
  114. +27 −20 pkg/kubectl/rollout_status.go
  115. +33 −4 pkg/kubectl/rollout_status_test.go
  116. +44 −2 pkg/printers/internalversion/describe.go
  117. +74 −0 pkg/printers/internalversion/describe_test.go
  118. +71 −90 pkg/scheduler/algorithm/predicates/metadata.go
  119. +60 −42 pkg/scheduler/algorithm/predicates/metadata_test.go
  120. +20 −34 pkg/scheduler/algorithm/predicates/predicates.go
  121. +1 −0 pkg/scheduler/apis/config/BUILD
  122. +41 −0 pkg/scheduler/apis/config/validation/BUILD
  123. +61 −0 pkg/scheduler/apis/config/validation/validation.go
  124. +140 −0 pkg/scheduler/apis/config/validation/validation_test.go
  125. +21 −18 pkg/scheduler/core/generic_scheduler.go
  126. +4 −0 pkg/scheduler/scheduler.go
  127. +12 −0 pkg/scheduler/testutil.go
  128. +1 −1 pkg/util/mount/fake.go
  129. +2 −2 pkg/util/mount/mount.go
  130. +7 −7 pkg/util/mount/mount_linux.go
  131. +1 −1 pkg/util/mount/mount_linux_test.go
  132. +3 −3 pkg/util/mount/mount_windows.go
  133. +2 −2 pkg/util/mount/mount_windows_test.go
  134. +1 −1 pkg/util/mount/nsenter_mount.go
  135. +3 −0 pkg/volume/local/BUILD
  136. +167 −1 pkg/volume/local/local.go
  137. +115 −5 pkg/volume/local/local_test.go
  138. +13 −6 pkg/volume/testing/testing.go
  139. +1 −0 staging/src/BUILD
  140. +519 −478 staging/src/k8s.io/api/core/v1/generated.pb.go
  141. +7 −3 staging/src/k8s.io/api/core/v1/generated.proto
  142. +7 −3 staging/src/k8s.io/api/core/v1/types.go
  143. +3 −2 staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go
  144. +6 −1 staging/src/k8s.io/api/core/v1/zz_generated.deepcopy.go
  145. +1 −0 staging/src/k8s.io/apimachinery/pkg/apis/config/BUILD
  146. +37 −0 staging/src/k8s.io/apimachinery/pkg/apis/config/validation/BUILD
  147. +31 −0 staging/src/k8s.io/apimachinery/pkg/apis/config/validation/validation.go
  148. +66 −0 staging/src/k8s.io/apimachinery/pkg/apis/config/validation/validation_test.go
  149. +16 −0 staging/src/k8s.io/apimachinery/pkg/util/validation/validation.go
  150. +28 −0 staging/src/k8s.io/apimachinery/pkg/util/validation/validation_test.go
  151. +1 −0 staging/src/k8s.io/apiserver/pkg/apis/config/BUILD
  152. +38 −0 staging/src/k8s.io/apiserver/pkg/apis/config/validation/BUILD
  153. +46 −0 staging/src/k8s.io/apiserver/pkg/apis/config/validation/validation.go
  154. +112 −0 staging/src/k8s.io/apiserver/pkg/apis/config/validation/validation_test.go
  155. +19 −2 staging/src/k8s.io/client-go/util/workqueue/parallelizer.go
  156. +2 −0 staging/src/k8s.io/kube-controller-manager/.github/PULL_REQUEST_TEMPLATE.md
  157. +7 −0 staging/src/k8s.io/kube-controller-manager/CONTRIBUTING.md
  158. +166 −0 staging/src/k8s.io/kube-controller-manager/Godeps/Godeps.json
  159. +2 −0 staging/src/k8s.io/kube-controller-manager/Godeps/OWNERS
  160. +5 −0 staging/src/k8s.io/kube-controller-manager/Godeps/Readme
  161. +202 −0 staging/src/k8s.io/kube-controller-manager/LICENSE
  162. +14 −0 staging/src/k8s.io/kube-controller-manager/OWNERS
  163. +25 −0 staging/src/k8s.io/kube-controller-manager/README.md
  164. +17 −0 staging/src/k8s.io/kube-controller-manager/SECURITY_CONTACTS
  165. +3 −0 staging/src/k8s.io/kube-controller-manager/code-of-conduct.md
  166. +35 −0 staging/src/k8s.io/kube-controller-manager/config/v1alpha1/BUILD
  167. +21 −0 staging/src/k8s.io/kube-controller-manager/config/v1alpha1/doc.go
  168. +43 −0 staging/src/k8s.io/kube-controller-manager/config/v1alpha1/register.go
  169. +440 −0 staging/src/k8s.io/kube-controller-manager/config/v1alpha1/types.go
  170. +537 −0 staging/src/k8s.io/kube-controller-manager/config/v1alpha1/zz_generated.deepcopy.go
  171. +1 −0 test/e2e/common/BUILD
  172. +266 −0 test/e2e/common/security_context.go
  173. +1 −1 test/e2e/storage/drivers/BUILD
  174. +2 −75 test/e2e/storage/drivers/in_tree.go
  175. +82 −60 test/e2e/storage/persistent_volumes-local.go
  176. +73 −0 test/e2e/storage/utils/utils.go
  177. +28 −80 test/e2e/storage/volume_provisioning.go
  178. +0 −187 test/e2e_node/security_context_test.go
  179. +1 −0 vendor/k8s.io/kube-controller-manager

Large diffs are not rendered by default.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -570,6 +570,12 @@ EOF
cat <<EOF >>/etc/gce.conf
token-url = ${TOKEN_URL}
token-body = ${TOKEN_BODY}
EOF
fi
if [[ -n "${CONTAINER_API_ENDPOINT:-}" ]]; then
use_cloud_config="true"
cat <<EOF >>/etc/gce.conf
container-api-endpoint = ${CONTAINER_API_ENDPOINT}
EOF
fi
if [[ -n "${PROJECT_ID:-}" ]]; then
@@ -12,8 +12,8 @@ go_library(
importpath = "k8s.io/kubernetes/cmd/controller-manager/app/options",
visibility = ["//visibility:public"],
deps = [
"//pkg/apis/componentconfig:go_default_library",
"//pkg/client/leaderelectionconfig:go_default_library",
"//pkg/controller/apis/config:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/config:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
@@ -19,7 +19,7 @@ package options
import (
"github.com/spf13/pflag"
"k8s.io/kubernetes/pkg/apis/componentconfig"
kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
)
// CloudProviderOptions holds the cloudprovider options.
@@ -44,7 +44,7 @@ func (s *CloudProviderOptions) AddFlags(fs *pflag.FlagSet) {
}
// ApplyTo fills up cloudprovider config with options.
func (s *CloudProviderOptions) ApplyTo(cfg *componentconfig.CloudProviderConfiguration) error {
func (s *CloudProviderOptions) ApplyTo(cfg *kubectrlmgrconfig.CloudProviderConfiguration) error {
if s == nil {
return nil
}
@@ -25,8 +25,8 @@ import (
"k8s.io/apimachinery/pkg/util/sets"
apiserverconfig "k8s.io/apiserver/pkg/apis/config"
apiserverflag "k8s.io/apiserver/pkg/util/flag"
"k8s.io/kubernetes/pkg/apis/componentconfig"
"k8s.io/kubernetes/pkg/client/leaderelectionconfig"
kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
)
// GenericControllerManagerConfigurationOptions holds the options which are generic.
@@ -44,7 +44,7 @@ type GenericControllerManagerConfigurationOptions struct {
// NewGenericControllerManagerConfigurationOptions returns generic configuration default values for both
// the kube-controller-manager and the cloud-contoller-manager. Any common changes should
// be made here. Any individual changes should be made in that controller.
func NewGenericControllerManagerConfigurationOptions(cfg componentconfig.GenericControllerManagerConfiguration) *GenericControllerManagerConfigurationOptions {
func NewGenericControllerManagerConfigurationOptions(cfg kubectrlmgrconfig.GenericControllerManagerConfiguration) *GenericControllerManagerConfigurationOptions {
o := &GenericControllerManagerConfigurationOptions{
Port: cfg.Port,
Address: cfg.Address,
@@ -82,7 +82,7 @@ func (o *GenericControllerManagerConfigurationOptions) AddFlags(fss *apiserverfl
}
// ApplyTo fills up generic config with options.
func (o *GenericControllerManagerConfigurationOptions) ApplyTo(cfg *componentconfig.GenericControllerManagerConfiguration) error {
func (o *GenericControllerManagerConfigurationOptions) ApplyTo(cfg *kubectrlmgrconfig.GenericControllerManagerConfiguration) error {
if o == nil {
return nil
}
@@ -20,7 +20,7 @@ import (
"github.com/spf13/pflag"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/apis/componentconfig"
kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
)
// KubeCloudSharedOptions holds the options shared between kube-controller-manager
@@ -43,7 +43,7 @@ type KubeCloudSharedOptions struct {
// NewKubeCloudSharedOptions returns common/default configuration values for both
// the kube-controller-manager and the cloud-contoller-manager. Any common changes should
// be made here. Any individual changes should be made in that controller.
func NewKubeCloudSharedOptions(cfg componentconfig.KubeCloudSharedConfiguration) *KubeCloudSharedOptions {
func NewKubeCloudSharedOptions(cfg kubectrlmgrconfig.KubeCloudSharedConfiguration) *KubeCloudSharedOptions {
o := &KubeCloudSharedOptions{
CloudProvider: &CloudProviderOptions{},
ExternalCloudVolumePlugin: cfg.ExternalCloudVolumePlugin,
@@ -84,7 +84,7 @@ func (o *KubeCloudSharedOptions) AddFlags(fs *pflag.FlagSet) {
}
// ApplyTo fills up KubeCloudShared config with options.
func (o *KubeCloudSharedOptions) ApplyTo(cfg *componentconfig.KubeCloudSharedConfiguration) error {
func (o *KubeCloudSharedOptions) ApplyTo(cfg *kubectrlmgrconfig.KubeCloudSharedConfiguration) error {
if o == nil {
return nil
}
@@ -19,7 +19,7 @@ package options
import (
"github.com/spf13/pflag"
"k8s.io/kubernetes/pkg/apis/componentconfig"
kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
)
// ServiceControllerOptions holds the ServiceController options.
@@ -37,7 +37,7 @@ func (o *ServiceControllerOptions) AddFlags(fs *pflag.FlagSet) {
}
// ApplyTo fills up ServiceController config with options.
func (o *ServiceControllerOptions) ApplyTo(cfg *componentconfig.ServiceControllerConfiguration) error {
func (o *ServiceControllerOptions) ApplyTo(cfg *kubectrlmgrconfig.ServiceControllerConfiguration) error {
if o == nil {
return nil
}
@@ -28,7 +28,6 @@ go_library(
"//pkg/apis/autoscaling/install:go_default_library",
"//pkg/apis/batch/install:go_default_library",
"//pkg/apis/certificates/install:go_default_library",
"//pkg/apis/componentconfig:go_default_library",
"//pkg/apis/coordination/install:go_default_library",
"//pkg/apis/core/install:go_default_library",
"//pkg/apis/events/install:go_default_library",
@@ -41,6 +40,7 @@ go_library(
"//pkg/cloudprovider:go_default_library",
"//pkg/cloudprovider/providers:go_default_library",
"//pkg/controller:go_default_library",
"//pkg/controller/apis/config:go_default_library",
"//pkg/controller/bootstrap:go_default_library",
"//pkg/controller/certificates/approver:go_default_library",
"//pkg/controller/certificates/cleaner:go_default_library",
@@ -95,7 +95,7 @@ func startHPAControllerWithMetricsClient(ctx ControllerContext, metricsClient me
replicaCalc,
ctx.InformerFactory.Autoscaling().V1().HorizontalPodAutoscalers(),
ctx.ComponentConfig.HPAController.HorizontalPodAutoscalerSyncPeriod.Duration,
ctx.ComponentConfig.HPAController.HorizontalPodAutoscalerDownscaleForbiddenWindow.Duration,
ctx.ComponentConfig.HPAController.HorizontalPodAutoscalerDownscaleStabilizationWindow.Duration,
).Run(ctx.Stop)
return nil, true, nil
}
@@ -6,7 +6,7 @@ go_library(
importpath = "k8s.io/kubernetes/cmd/kube-controller-manager/app/config",
visibility = ["//visibility:public"],
deps = [
"//pkg/apis/componentconfig:go_default_library",
"//pkg/controller/apis/config:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/server:go_default_library",
"//staging/src/k8s.io/client-go/kubernetes:go_default_library",
"//staging/src/k8s.io/client-go/rest:go_default_library",
@@ -21,12 +21,12 @@ import (
clientset "k8s.io/client-go/kubernetes"
restclient "k8s.io/client-go/rest"
"k8s.io/client-go/tools/record"
"k8s.io/kubernetes/pkg/apis/componentconfig"
kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
)
// Config is the main context object for the controller manager.
type Config struct {
ComponentConfig componentconfig.KubeControllerManagerConfiguration
ComponentConfig kubectrlmgrconfig.KubeControllerManagerConfiguration
SecureServing *apiserver.SecureServingInfo
// LoopbackClientConfig is a config for a privileged loopback connection
@@ -50,9 +50,9 @@ import (
genericcontrollermanager "k8s.io/kubernetes/cmd/controller-manager/app"
"k8s.io/kubernetes/cmd/kube-controller-manager/app/config"
"k8s.io/kubernetes/cmd/kube-controller-manager/app/options"
"k8s.io/kubernetes/pkg/apis/componentconfig"
"k8s.io/kubernetes/pkg/cloudprovider"
"k8s.io/kubernetes/pkg/controller"
kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
serviceaccountcontroller "k8s.io/kubernetes/pkg/controller/serviceaccount"
"k8s.io/kubernetes/pkg/serviceaccount"
"k8s.io/kubernetes/pkg/util/configz"
@@ -250,7 +250,7 @@ type ControllerContext struct {
InformerFactory informers.SharedInformerFactory
// ComponentConfig provides access to init options for a given controller
ComponentConfig componentconfig.KubeControllerManagerConfiguration
ComponentConfig kubectrlmgrconfig.KubeControllerManagerConfiguration
// DeferredDiscoveryRESTMapper is a RESTMapper that will defer
// initialization of the RESTMapper until the first mapping is
@@ -34,8 +34,8 @@ go_library(
"//cmd/controller-manager/app/options:go_default_library",
"//cmd/kube-controller-manager/app/config:go_default_library",
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/componentconfig:go_default_library",
"//pkg/apis/componentconfig/v1alpha1:go_default_library",
"//pkg/controller/apis/config:go_default_library",
"//pkg/controller/apis/config/v1alpha1:go_default_library",
"//pkg/controller/garbagecollector:go_default_library",
"//pkg/features:go_default_library",
"//pkg/master/ports:go_default_library",
@@ -51,6 +51,7 @@ go_library(
"//staging/src/k8s.io/client-go/rest:go_default_library",
"//staging/src/k8s.io/client-go/tools/clientcmd:go_default_library",
"//staging/src/k8s.io/client-go/tools/record:go_default_library",
"//staging/src/k8s.io/kube-controller-manager/config/v1alpha1:go_default_library",
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/github.com/spf13/pflag:go_default_library",
],
@@ -76,7 +77,7 @@ go_test(
tags = ["automanaged"],
deps = [
"//cmd/controller-manager/app/options:go_default_library",
"//pkg/apis/componentconfig:go_default_library",
"//pkg/controller/apis/config:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/config:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/diff:go_default_library",
@@ -20,7 +20,7 @@ import (
"github.com/spf13/pflag"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/apis/componentconfig"
kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
)
// AttachDetachControllerOptions holds the AttachDetachController options.
@@ -40,7 +40,7 @@ func (o *AttachDetachControllerOptions) AddFlags(fs *pflag.FlagSet) {
}
// ApplyTo fills up AttachDetachController config with options.
func (o *AttachDetachControllerOptions) ApplyTo(cfg *componentconfig.AttachDetachControllerConfiguration) error {
func (o *AttachDetachControllerOptions) ApplyTo(cfg *kubectrlmgrconfig.AttachDetachControllerConfiguration) error {
if o == nil {
return nil
}
@@ -20,7 +20,7 @@ import (
"github.com/spf13/pflag"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/apis/componentconfig"
kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
)
const (
@@ -52,7 +52,7 @@ func (o *CSRSigningControllerOptions) AddFlags(fs *pflag.FlagSet) {
}
// ApplyTo fills up CSRSigningController config with options.
func (o *CSRSigningControllerOptions) ApplyTo(cfg *componentconfig.CSRSigningControllerConfiguration) error {
func (o *CSRSigningControllerOptions) ApplyTo(cfg *kubectrlmgrconfig.CSRSigningControllerConfiguration) error {
if o == nil {
return nil
}
@@ -19,7 +19,7 @@ package options
import (
"github.com/spf13/pflag"
"k8s.io/kubernetes/pkg/apis/componentconfig"
kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
)
// DaemonSetControllerOptions holds the DaemonSetController options.
@@ -35,7 +35,7 @@ func (o *DaemonSetControllerOptions) AddFlags(fs *pflag.FlagSet) {
}
// ApplyTo fills up DaemonSetController config with options.
func (o *DaemonSetControllerOptions) ApplyTo(cfg *componentconfig.DaemonSetControllerConfiguration) error {
func (o *DaemonSetControllerOptions) ApplyTo(cfg *kubectrlmgrconfig.DaemonSetControllerConfiguration) error {
if o == nil {
return nil
}
@@ -20,7 +20,7 @@ import (
"github.com/spf13/pflag"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/apis/componentconfig"
kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
)
// DeploymentControllerOptions holds the DeploymentController options.
@@ -40,7 +40,7 @@ func (o *DeploymentControllerOptions) AddFlags(fs *pflag.FlagSet) {
}
// ApplyTo fills up DeploymentController config with options.
func (o *DeploymentControllerOptions) ApplyTo(cfg *componentconfig.DeploymentControllerConfiguration) error {
func (o *DeploymentControllerOptions) ApplyTo(cfg *kubectrlmgrconfig.DeploymentControllerConfiguration) error {
if o == nil {
return nil
}
@@ -19,7 +19,7 @@ package options
import (
"github.com/spf13/pflag"
"k8s.io/kubernetes/pkg/apis/componentconfig"
kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
)
// DeprecatedControllerOptions holds the DeprecatedController options, those option are deprecated.
@@ -46,12 +46,12 @@ func (o *DeprecatedControllerOptions) AddFlags(fs *pflag.FlagSet) {
}
// ApplyTo fills up DeprecatedController config with options.
func (o *DeprecatedControllerOptions) ApplyTo(cfg *componentconfig.DeprecatedControllerConfiguration) error {
func (o *DeprecatedControllerOptions) ApplyTo(cfg *kubectrlmgrconfig.DeprecatedControllerConfiguration) error {
if o == nil {
return nil
}
cfg.DeletingPodsQps = o.DeletingPodsQPS
cfg.DeletingPodsQPS = o.DeletingPodsQPS
cfg.DeletingPodsBurst = o.DeletingPodsBurst
cfg.RegisterRetryCount = o.RegisterRetryCount
@@ -19,7 +19,7 @@ package options
import (
"github.com/spf13/pflag"
"k8s.io/kubernetes/pkg/apis/componentconfig"
kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
)
// EndpointControllerOptions holds the EndPointController options.
@@ -37,7 +37,7 @@ func (o *EndpointControllerOptions) AddFlags(fs *pflag.FlagSet) {
}
// ApplyTo fills up EndPointController config with options.
func (o *EndpointControllerOptions) ApplyTo(cfg *componentconfig.EndpointControllerConfiguration) error {
func (o *EndpointControllerOptions) ApplyTo(cfg *kubectrlmgrconfig.EndpointControllerConfiguration) error {
if o == nil {
return nil
}
@@ -19,13 +19,13 @@ package options
import (
"github.com/spf13/pflag"
"k8s.io/kubernetes/pkg/apis/componentconfig"
kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
)
// GarbageCollectorControllerOptions holds the GarbageCollectorController options.
type GarbageCollectorControllerOptions struct {
ConcurrentGCSyncs int32
GCIgnoredResources []componentconfig.GroupResource
GCIgnoredResources []kubectrlmgrconfig.GroupResource
EnableGarbageCollector bool
}
@@ -40,7 +40,7 @@ func (o *GarbageCollectorControllerOptions) AddFlags(fs *pflag.FlagSet) {
}
// ApplyTo fills up GarbageCollectorController config with options.
func (o *GarbageCollectorControllerOptions) ApplyTo(cfg *componentconfig.GarbageCollectorControllerConfiguration) error {
func (o *GarbageCollectorControllerOptions) ApplyTo(cfg *kubectrlmgrconfig.GarbageCollectorControllerConfiguration) error {
if o == nil {
return nil
}
Oops, something went wrong.

0 comments on commit 553515b

Please sign in to comment.