Skip to content

fix serviceaccounts client #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
soltysh merged 1 commit into from
Oct 26, 2017
Merged

fix serviceaccounts client #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/serviceaccounts/controllers/deleted_dockercfg_secrets_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
informers "k8s.io/client-go/informers"
externalfake "k8s.io/client-go/kubernetes/fake"
clientgotesting "k8s.io/client-go/testing"
"k8s.io/client-go/tools/cache"
"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake"
"k8s.io/kubernetes/pkg/controller"
)

Expand Down Expand Up @@ -57,7 +57,7 @@ func TestDockercfgDeletion(t *testing.T) {
// Re-seed to reset name generation
rand.Seed(1)

client := fake.NewSimpleClientset(tc.ClientObjects...)
client := externalfake.NewSimpleClientset(tc.ClientObjects...)
informerFactory := informers.NewSharedInformerFactory(client, controller.NoResyncPeriodFunc())
controller := NewDockercfgDeletedController(
informerFactory.Core().V1().Secrets(),
Expand Down
6 changes: 3 additions & 3 deletions pkg/serviceaccounts/controllers/deleted_token_secrets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"k8s.io/apimachinery/pkg/fields"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
informers "k8s.io/client-go/informers/core/v1"
kclientset "k8s.io/client-go/kubernetes"
"k8s.io/client-go/tools/cache"
"k8s.io/kubernetes/pkg/api"
kclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
)

// DockercfgTokenDeletedControllerOptions contains options for the DockercfgTokenDeletedController
Expand Down Expand Up @@ -98,8 +98,8 @@ func (e *DockercfgTokenDeletedController) secretDeleted(obj interface{}) {
}

// findDockercfgSecret checks all the secrets in the namespace to see if the token secret has any existing dockercfg secrets that reference it
func (e *DockercfgTokenDeletedController) findDockercfgSecrets(tokenSecret *v1.Secret) ([]*api.Secret, error) {
dockercfgSecrets := []*api.Secret{}
func (e *DockercfgTokenDeletedController) findDockercfgSecrets(tokenSecret *v1.Secret) ([]*v1.Secret, error) {
dockercfgSecrets := []*v1.Secret{}

options := metav1.ListOptions{FieldSelector: fields.OneTermEqualSelector(api.SecretTypeField, string(v1.SecretTypeDockercfg)).String()}
potentialSecrets, err := e.client.Core().Secrets(tokenSecret.Namespace).List(options)
Expand Down
4 changes: 2 additions & 2 deletions pkg/serviceaccounts/controllers/deleted_token_secrets_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
informers "k8s.io/client-go/informers"
externalfake "k8s.io/client-go/kubernetes/fake"
clientgotesting "k8s.io/client-go/testing"
"k8s.io/client-go/tools/cache"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake"
"k8s.io/kubernetes/pkg/controller"
)

Expand Down Expand Up @@ -180,7 +180,7 @@ func TestTokenDeletion(t *testing.T) {
// Re-seed to reset name generation
rand.Seed(1)

client := fake.NewSimpleClientset(tc.ClientObjects...)
client := externalfake.NewSimpleClientset(tc.ClientObjects...)
informerFactory := informers.NewSharedInformerFactory(client, controller.NoResyncPeriodFunc())
controller := NewDockercfgTokenDeletedController(
informerFactory.Core().V1().Secrets(),
Expand Down
2 changes: 1 addition & 1 deletion pkg/serviceaccounts/controllers/docker_registry_service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/watch"
informers "k8s.io/client-go/informers"
"k8s.io/client-go/kubernetes/fake"
clientgotesting "k8s.io/client-go/testing"
"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake"
"k8s.io/kubernetes/pkg/controller"
"k8s.io/kubernetes/pkg/credentialprovider"
)
Expand Down