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

Merge branch 'experiment/crd_configuration' of github.com:zalando-incubator/postgres-operator into experiment/crd_configuration

Browse Source
This commit is contained in:
Oleksii Kliukin
2018-06-13 14:41:12 +02:00
parent e558240fdf 2c9c09ebff
commit 6bebb87d8f
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/controller/controller.go
+1 -1
View File
@@ -169,7 +169,7 @@ func (c *Controller) initController() {
if err := c.createOperatorCRD(); err != nil {
c.logger.Fatalf("could not register Operator Configuration CustomResourceDefinition: %v", err)
}
if cfg, err := c.readOperatorConfigurationFromCRD(configObjectName); err != nil {
if cfg, err := c.readOperatorConfigurationFromCRD(spec.GetOperatorNamespace(), configObjectName); err != nil {
c.logger.Fatalf("unable to read operator configuration: %v", err)
} else {
c.opConfig = c.importConfigurationFromCRD(&cfg.Configuration)
pkg/controller/operator_config.go
+2 -2
View File
@@ -9,14 +9,14 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
func (c *Controller) readOperatorConfigurationFromCRD(configObjectName string) (*config.OperatorConfiguration, error) {
func (c *Controller) readOperatorConfigurationFromCRD(configObjectNamespace, configObjectName string) (*config.OperatorConfiguration, error) {
var (
config config.OperatorConfiguration
)
req := c.KubeClient.CRDREST.Get().
Name(configObjectName).
Namespace(c.opConfig.WatchedNamespace).
Namespace(configObjectNamespace).
Resource(constants.OperatorConfigCRDResource).
VersionedParams(&metav1.ListOptions{ResourceVersion: "0"}, metav1.ParameterCodec)