From 0ed47c7aeacec990b493c3c803432a6ec6342dc3 Mon Sep 17 00:00:00 2001 From: Murat Kabilov Date: Tue, 25 Jul 2017 00:36:10 +0200 Subject: [PATCH] fix controller util test --- pkg/controller/util_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/controller/util_test.go b/pkg/controller/util_test.go index bd7d7d049..6bea382d6 100644 --- a/pkg/controller/util_test.go +++ b/pkg/controller/util_test.go @@ -5,11 +5,11 @@ import ( "reflect" "testing" + meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1core "k8s.io/client-go/kubernetes/typed/core/v1" "k8s.io/client-go/pkg/api/v1" "github.com/zalando-incubator/postgres-operator/pkg/spec" - "github.com/zalando-incubator/postgres-operator/pkg/util/config" "github.com/zalando-incubator/postgres-operator/pkg/util/k8sutil" ) @@ -21,7 +21,7 @@ type mockSecret struct { v1core.SecretInterface } -func (c *mockSecret) Get(name string) (*v1.Secret, error) { +func (c *mockSecret) Get(name string, options meta_v1.GetOptions) (*v1.Secret, error) { if name != testInfrastructureRolesSecretName { return nil, fmt.Errorf("NotFound") } @@ -48,7 +48,7 @@ func newMockKubernetesClient() k8sutil.KubernetesClient { } func newMockController() *Controller { - controller := NewController(&Config{}, &config.Config{}) + controller := NewController(&Config{}) controller.opConfig.ClusterNameLabel = "cluster-name" controller.opConfig.InfrastructureRolesSecretName = spec.NamespacedName{v1.NamespaceDefault, testInfrastructureRolesSecretName} @@ -70,7 +70,7 @@ func TestPodClusterName(t *testing.T) { }, { &v1.Pod{ - ObjectMeta: v1.ObjectMeta{ + ObjectMeta: meta_v1.ObjectMeta{ Namespace: v1.NamespaceDefault, Labels: map[string]string{ mockController.opConfig.ClusterNameLabel: "testcluster",