Skip to content

Commit cb6334b

Browse files
committed
Fix failing unit tests due to missing kubeconfig in unit test environment
1 parent d0f4696 commit cb6334b

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

pkg/gce-cloud-provider/compute/gce.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ func CreateCloudProvider(ctx context.Context, vendorVersion string, configPath s
197197

198198
if multiTenancyEnabled {
199199
klog.Info("Setting up multitenancy")
200-
ti, err := tenancy.NewTenantsInformer(multiTenancyEnabled)
200+
ti, err := tenancy.NewTenantsInformer(multiTenancyEnabled, tenancy.GetKubeConfig())
201201
if err != nil {
202202
return nil, fmt.Errorf("failed initializing tenant informer: %w", err)
203203
}

pkg/gce-cloud-provider/compute/tenancy/informer.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,12 @@ var defaultResyncPeriod = 10 * time.Minute
4242
// tenancy.gke.io/tenants objects.
4343
//
4444
// After creating a new TenantsInformer, you must call Run() to start it.
45-
func NewTenantsInformer(isMultiTenantCluster bool) (TenantsInformer, error) {
45+
func NewTenantsInformer(isMultiTenantCluster bool, kubeConfig *rest.Config) (TenantsInformer, error) {
4646
if !isMultiTenantCluster {
4747
return NewNoopTenantsInformer(), nil
4848
}
4949

50-
kc := GetKubeConfig()
51-
dynamicClient, err := newDynamicClientForConfig(kc)
50+
dynamicClient, err := newDynamicClientForConfig(kubeConfig)
5251
if err != nil {
5352
return nil, fmt.Errorf("failed to create dynamic client for CRD: %w", err)
5453
}

pkg/gce-cloud-provider/compute/tenancy/informer_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ func TestNewTenantsInformer_MultiTenantCluster(t *testing.T) {
1818
newDynamicClientForConfig = func(*rest.Config) (dynamic.Interface, error) {
1919
return dynamicfake.NewSimpleDynamicClient(runtime.NewScheme()), nil
2020
}
21-
informer, err := NewTenantsInformer(true)
21+
informer, err := NewTenantsInformer(true, &rest.Config{})
2222
if err != nil {
2323
t.Fatalf("NewTenantsInformer(true, &rest.Config{}, 1h) failed: %v", err)
2424
}
@@ -34,7 +34,7 @@ func TestNewTenantsInformer_SingleTenantCluster(t *testing.T) {
3434
newDynamicClientForConfig = func(*rest.Config) (dynamic.Interface, error) {
3535
return dynamicfake.NewSimpleDynamicClient(runtime.NewScheme()), nil
3636
}
37-
informer, err := NewTenantsInformer(false)
37+
informer, err := NewTenantsInformer(false, &rest.Config{})
3838
if err != nil {
3939
t.Fatalf("NewTenantsInformer(false, &rest.Config{}, 1h) failed: %v", err)
4040
}

0 commit comments

Comments
 (0)