github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-08 03:33:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #127369 from seans3/generalize-ccm-test-server

Browse Source 
Adds more flexible version of test ccm server
This commit is contained in:
Kubernetes Prow Robot 2024-12-12 02:56:44 +00:00 committed by GitHub
commit 1de3ab8ce7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
staging/src/k8s.io/cloud-provider/app/testing/testserver.go
View File

@ -72,6 +72,16 @@ type TestServer struct {
// files that because Golang testing's call to os.Exit will not give a stop channel go routine // files that because Golang testing's call to os.Exit will not give a stop channel go routine
// enough time to remove temporary files. // enough time to remove temporary files.
func StartTestServer(ctx context.Context, customFlags []string) (result TestServer, err error) { func StartTestServer(ctx context.Context, customFlags []string) (result TestServer, err error) {
return StartTestServerWithOptions(ctx, customFlags, app.DefaultInitFuncConstructors, names.CCMControllerAliases())
}
// StartTestServerWithOptions starts a cloud-controller-manager with extra controller loop initializer constructors
// and controller loop aliaes. Within the returned TestServer, a rest client config, a tear-down func,
// and location of the tmpdir are returned; or an error if one occurred.
func StartTestServerWithOptions(ctx context.Context,
customFlags []string,
constructors map[string]app.ControllerInitFuncConstructor,
aliases map[string]string) (result TestServer, err error) {
logger := klog.FromContext(ctx) logger := klog.FromContext(ctx)
stopCh := make(chan struct{}) stopCh := make(chan struct{})
var errCh chan error var errCh chan error
@ -103,11 +113,11 @@ func StartTestServer(ctx context.Context, customFlags []string) (result TestServ
return result, fmt.Errorf("failed to create temp dir: %v", err) return result, fmt.Errorf("failed to create temp dir: %v", err)
} }
// Do not run leader election.
s, err := options.NewCloudControllerManagerOptions() s, err := options.NewCloudControllerManagerOptions()
if err != nil { if err != nil {
return TestServer{}, err return TestServer{}, err
} }
s.Generic.LeaderElection.LeaderElect = false s.Generic.LeaderElection.LeaderElect = false
cloudInitializer := func(config *config.CompletedConfig) cloudprovider.Interface { cloudInitializer := func(config *config.CompletedConfig) cloudprovider.Interface {
@ -126,7 +136,7 @@ func StartTestServer(ctx context.Context, customFlags []string) (result TestServ
return cloud return cloud
} }
fss := cliflag.NamedFlagSets{} fss := cliflag.NamedFlagSets{}
command := app.NewCloudControllerManagerCommand(s, cloudInitializer, app.DefaultInitFuncConstructors, names.CCMControllerAliases(), fss, stopCh) command := app.NewCloudControllerManagerCommand(s, cloudInitializer, constructors, aliases, fss, stopCh)
commandArgs := []string{} commandArgs := []string{}
listeners := []net.Listener{} listeners := []net.Listener{}