public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix controller util test

This commit is contained in:
Murat Kabilov 2017-07-25 00:36:10 +02:00
parent 2bbcb5f627
commit 0ed47c7aea
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/controller/util_test.go
View File

@ -5,11 +5,11 @@ import (
"reflect" "reflect"
"testing" "testing"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
v1core "k8s.io/client-go/kubernetes/typed/core/v1" v1core "k8s.io/client-go/kubernetes/typed/core/v1"
"k8s.io/client-go/pkg/api/v1" "k8s.io/client-go/pkg/api/v1"
"github.com/zalando-incubator/postgres-operator/pkg/spec" "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" "github.com/zalando-incubator/postgres-operator/pkg/util/k8sutil"
) )
@ -21,7 +21,7 @@ type mockSecret struct {
v1core.SecretInterface 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 { if name != testInfrastructureRolesSecretName {
return nil, fmt.Errorf("NotFound") return nil, fmt.Errorf("NotFound")
} }
@ -48,7 +48,7 @@ func newMockKubernetesClient() k8sutil.KubernetesClient {
} }
func newMockController() *Controller { func newMockController() *Controller {
controller := NewController(&Config{}, &config.Config{}) controller := NewController(&Config{})
controller.opConfig.ClusterNameLabel = "cluster-name" controller.opConfig.ClusterNameLabel = "cluster-name"
controller.opConfig.InfrastructureRolesSecretName = controller.opConfig.InfrastructureRolesSecretName =
spec.NamespacedName{v1.NamespaceDefault, testInfrastructureRolesSecretName} spec.NamespacedName{v1.NamespaceDefault, testInfrastructureRolesSecretName}
@ -70,7 +70,7 @@ func TestPodClusterName(t *testing.T) {
}, },
{ {
&v1.Pod{ &v1.Pod{
ObjectMeta: v1.ObjectMeta{ ObjectMeta: meta_v1.ObjectMeta{
Namespace: v1.NamespaceDefault, Namespace: v1.NamespaceDefault,
Labels: map[string]string{ Labels: map[string]string{
mockController.opConfig.ClusterNameLabel: "testcluster", mockController.opConfig.ClusterNameLabel: "testcluster",