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

resolve merge conflicts

Browse Source
This commit is contained in:
Sergey Dudoladov
2019-02-27 13:07:48 +01:00
parent 11019f557e 74cc9a44f8
commit 9d430fc141
101 changed files with 1025 additions and 370 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/util/k8sutil/k8sutil.go
+2 -2
View File
@@ -4,9 +4,9 @@ import (
"fmt"
"reflect"
"github.com/zalando-incubator/postgres-operator/pkg/util/constants"
batchv1beta1 "k8s.io/client-go/kubernetes/typed/batch/v1beta1"
"github.com/zalando/postgres-operator/pkg/util/constants"
"k8s.io/api/core/v1"
policybeta1 "k8s.io/api/policy/v1beta1"
apiextclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
@@ -20,7 +20,7 @@ import (
"k8s.io/client-go/rest"
"k8s.io/client-go/tools/clientcmd"
acidv1client "github.com/zalando-incubator/postgres-operator/pkg/generated/clientset/versioned"
acidv1client "github.com/zalando/postgres-operator/pkg/generated/clientset/versioned"
)
// KubernetesClient describes getters for Kubernetes objects