public_git/postgres-operator
1
0
Fork 0
mirror of https://github.com/zalando/postgres-operator.git synced 2026-10-03 21:25:28 +02:00
Code Issues Projects Releases Wiki Activity

fix merge errors

Browse Source
This commit is contained in:
Felix Kunde
2022-03-23 14:38:42 +01:00
parent 181d87f9b2
commit b037bc3777
2 changed files with 52 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cluster/cluster_test.go
-8
View File
@@ -1055,14 +1055,6 @@ func TestCompareEnv(t *testing.T) {
}
}
func newFakeK8sServiceClient() (k8sutil.KubernetesClient, *fake.Clientset) {
clientSet := fake.NewSimpleClientset()
return k8sutil.KubernetesClient{
ServicesGetter: clientSet.CoreV1(),
}, clientSet
}
func newService(ann map[string]string, svcT v1.ServiceType, lbSr []string) *v1.Service {
svc := &v1.Service{
Spec: v1.ServiceSpec{