Skip to content

Commit

Permalink
Bug fix for clientset generation (CentaurusInfra#558)
Browse files Browse the repository at this point in the history
* Bugfix for KubeConfig copy - clone each item for aggregated config

* auto generated code

* Remove extra logic/log in workload controller manager.
  • Loading branch information
Sindica authored Aug 12, 2020
1 parent 5069e78 commit 24422cc
Show file tree
Hide file tree
Showing 19 changed files with 150 additions and 114 deletions.
2 changes: 1 addition & 1 deletion cmd/kube-scheduler/app/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ func runCommand(cmd *cobra.Command, args []string, opts *options.Options) error
// Run executes the scheduler based on the given configuration. It only return on error or when stopCh is closed.
func Run(cc schedulerserverconfig.CompletedConfig, stopCh <-chan struct{}) error {
// To help debugging, immediately log version
klog.V(1).Infof("Starting Kubernetes Scheduler version %+v", version.Get())
klog.V(1).Infof("Starting Kubernetes Scheduler version %+v. QPS %v", version.Get(), cc.ComponentConfig.ClientConnection.QPS)

// Create the scheduler.
sched, err := scheduler.New(cc.Client,
Expand Down
2 changes: 0 additions & 2 deletions cmd/workload-controller-manager/app/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@ go_library(
"//staging/src/k8s.io/client-go/discovery/cached:go_default_library",
"//staging/src/k8s.io/client-go/informers:go_default_library",
"//staging/src/k8s.io/client-go/kubernetes:go_default_library",
"//staging/src/k8s.io/client-go/rest:go_default_library",
"//staging/src/k8s.io/client-go/restmapper:go_default_library",
"//staging/src/k8s.io/client-go/util/flowcontrol:go_default_library",
"//staging/src/k8s.io/component-base/config:go_default_library",
"//vendor/github.com/grafov/bcast:go_default_library",
"//vendor/github.com/prometheus/client_golang/prometheus:go_default_library",
Expand Down
10 changes: 1 addition & 9 deletions cmd/workload-controller-manager/app/controllermanager.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ import (
"context"
"fmt"
"k8s.io/client-go/datapartition"
restclient "k8s.io/client-go/rest"
"k8s.io/client-go/util/flowcontrol"
controller "k8s.io/kubernetes/pkg/cloudfabric-controller"
"k8s.io/kubernetes/pkg/cloudfabric-controller/deployment"
"net/http"
Expand Down Expand Up @@ -123,13 +121,7 @@ func StartControllerManager(c *config.CompletedConfig, stopCh <-chan struct{}) e
}

clientBuilder := rootClientBuilder

heartBeatClientConfigs := restclient.CopyConfigs(c.ControllerManagerConfig)
for _, kubeConfig := range heartBeatClientConfigs.GetAllConfigs() {
kubeConfig.RateLimiter = flowcontrol.NewTokenBucketRateLimiter(kubeConfig.QPS, kubeConfig.Burst)
}

heartBeatClientBuilder := controller.SimpleControllerClientBuilder{ClientConfig: heartBeatClientConfigs}
heartBeatClientBuilder := controller.SimpleControllerClientBuilder{ClientConfig: c.ControllerManagerConfig}

ctx := context.TODO()

Expand Down
2 changes: 1 addition & 1 deletion cmd/workload-controller-manager/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ func getConfig() (*controllerManagerConfig.Config, error) {
}

klog.Infof("Current workload controller port %d", workloadControllerPort)
klog.Infof("Rest client QPS %v, kubeconfig [%#v]", controllerManagerKubeConfig.GetConfig().QPS, controllerManagerKubeConfig.GetConfig())
klog.Infof("Rest client QPS %v", controllerManagerKubeConfig.GetConfig().QPS)

insecureServing := (&apiserveroptions.DeprecatedInsecureServingOptions{
BindAddress: net.ParseIP("0.0.0.0"),
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

81 changes: 42 additions & 39 deletions staging/src/k8s.io/client-go/kubernetes/clientset.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 24422cc

Please sign in to comment.