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

more fixes on clientSet vs getters

Browse Source
This commit is contained in:
Felix Kunde
2020-12-08 15:42:49 +01:00
parent 37bc33d176
commit ec0d8f8aec
5 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/util/k8sutil/k8sutil.go
+6 -5
View File
@@ -59,7 +59,8 @@ type KubernetesClient struct {
acidv1.PostgresTeamsGetter
acidv1.PostgresqlsGetter
RESTClient rest.Interface
RESTClient rest.Interface
AcidV1ClientSet *acidv1client.Clientset
}
type mockSecret struct {
@@ -157,14 +158,14 @@ func NewFromConfig(cfg *rest.Config) (KubernetesClient, error) {
kubeClient.CustomResourceDefinitionsGetter = apiextClient.ApiextensionsV1()
acidClient, err := acidv1client.NewForConfig(cfg)
kubeClient.AcidV1ClientSet = acidv1client.NewForConfigOrDie(cfg)
if err != nil {
return kubeClient, fmt.Errorf("could not create acid.zalan.do clientset: %v", err)
}
kubeClient.OperatorConfigurationsGetter = acidClient.AcidV1()
kubeClient.PostgresTeamsGetter = acidClient.AcidV1()
kubeClient.PostgresqlsGetter = acidClient.AcidV1()
kubeClient.OperatorConfigurationsGetter = kubeClient.AcidV1ClientSet.AcidV1()
kubeClient.PostgresTeamsGetter = kubeClient.AcidV1ClientSet.AcidV1()
kubeClient.PostgresqlsGetter = kubeClient.AcidV1ClientSet.AcidV1()
return kubeClient, nil
}