Apply the configuration from CRD.

pkg/controller/controller.go

@@ -101,23 +101,24 @@ func (c *Controller) initOperatorConfig() {
 		c.logger.Infoln("no ConfigMap specified. Loading default values")
 	}
 
-	configMapData["watched_namespace"] = c.getEffectiveNamespace(os.Getenv("WATCHED_NAMESPACE"), configMapData["watched_namespace"])
-
-	if c.config.NoDatabaseAccess {
-		configMapData["enable_database_access"] = "false"
-	}
-	if c.config.NoTeamsAPI {
-		configMapData["enable_teams_api"] = "false"
-	}
-
 	c.opConfig = config.NewFromMap(configMapData)
 	c.warnOnDeprecatedOperatorParameters()
 
+}
+
+func (c *Controller) modifyConfigFromEnvironment() {
+	c.opConfig.WatchedNamespace = c.getEffectiveNamespace(os.Getenv("WATCHED_NAMESPACE"), c.opConfig.WatchedNamespace)
+
+	if c.config.NoDatabaseAccess {
+		c.opConfig.EnableDBAccess = c.config.NoDatabaseAccess
+	}
+	if c.config.NoTeamsAPI {
+		c.opConfig.EnableTeamsAPI = c.config.NoTeamsAPI
+	}
 	scalyrAPIKey := os.Getenv("SCALYR_API_KEY")
 	if scalyrAPIKey != "" {
 		c.opConfig.ScalyrAPIKey = scalyrAPIKey
 	}
-
 }
 
 // warningOnDeprecatedParameters emits warnings upon finding deprecated parmaters
@@ -163,33 +164,34 @@ func (c *Controller) initPodServiceAccount() {
 
 func (c *Controller) initController() {
 	c.initClients()
-	c.initOperatorConfig()
-	c.initPodServiceAccount()
 
-	c.initSharedInformers()
-
-	c.logger.Infof("config: %s", c.opConfig.MustMarshal())
-
-	if c.opConfig.DebugLogging {
-		c.logger.Logger.Level = logrus.DebugLevel
+	if configObjectName := os.Getenv("POSTGRES_OPERATOR_CONFIGURATION_OBJECT"); configObjectName != "" {
+		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 {
+			c.logger.Fatalf("unable to read operator configuration: %v", err)
+		} else {
+			c.opConfig = c.importConfigurationFromCRD(&cfg.Configuration)
+		}
+	} else {
+		c.initOperatorConfig()
 	}
 
+	c.modifyConfigFromEnvironment()
 
 	if err := c.createPostgresCRD(); err != nil {
 		c.logger.Fatalf("could not register Postgres CustomResourceDefinition: %v", err)
 	}
 
-	if err := c.createOperatorCRD(); err != nil {
-		c.logger.Fatalf("could not register Operator Configuration CustomResourceDefinition: %v", err)
+	c.initPodServiceAccount()
+	c.initSharedInformers()
+
+	if c.opConfig.DebugLogging {
+		c.logger.Logger.Level = logrus.DebugLevel
 	}
 
-	if configObjectName := os.Getenv("POSTGRES_OPERATOR_CONFIGURATION_OBJECT"); configObjectName != "" {
-		if config, err := c.readOperatorConfigurationFromCRD(configObjectName); err != nil {
-			c.logger.Fatalf("unable to read operator configuration: %v", err)
-		} else {
-			c.logger.Fatalf("operator configuration: %#v", config)
-		}
-	}
+	c.logger.Infof("config: %s", c.opConfig.MustMarshal())
 
 	if infraRoles, err := c.getInfrastructureRoles(&c.opConfig.InfrastructureRolesSecretName); err != nil {
 		c.logger.Warningf("could not get infrastructure roles: %v", err)

pkg/controller/operator_config.go

@@ -4,14 +4,12 @@ import (
 	"encoding/json"
 	"fmt"
 
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"github.com/zalando-incubator/postgres-operator/pkg/util/constants"
-
 	"github.com/zalando-incubator/postgres-operator/pkg/util/config"
+	"github.com/zalando-incubator/postgres-operator/pkg/util/constants"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-
-func (c *Controller) readOperatorConfigurationFromCRD(configObjectName string) (*config.OperatorConfiguration, error){
+func (c *Controller) readOperatorConfigurationFromCRD(configObjectName string) (*config.OperatorConfiguration, error) {
 	var (
 		config config.OperatorConfiguration
 	)
@@ -22,7 +20,7 @@ func (c *Controller) readOperatorConfigurationFromCRD(configObjectName string) (
 		Resource(constants.OperatorConfigCRDResource).
 		VersionedParams(&metav1.ListOptions{ResourceVersion: "0"}, metav1.ParameterCodec)
 
-	data, err := req.DoRaw();
+	data, err := req.DoRaw()
 	if err != nil {
 		return nil, fmt.Errorf("could not get operator configuration object %s: %v", configObjectName, err)
 	}
@@ -31,4 +29,77 @@ func (c *Controller) readOperatorConfigurationFromCRD(configObjectName string) (
 	}
 
 	return &config, nil
-}
+}
+
+// importConfigurationFromCRD is a transitional function that converts CRD configuration to the one based on the configmap
+func (c *Controller) importConfigurationFromCRD(fromCRD *config.OperatorConfigurationData) *config.Config {
+	result := &config.Config{}
+
+	result.EtcdHost = fromCRD.EtcdHost
+	result.DockerImage = fromCRD.DockerImage
+	result.Workers = fromCRD.Workers
+	result.MinInstances = fromCRD.MinInstances
+	result.MaxInstances = fromCRD.MaxInstances
+	result.ResyncPeriod = fromCRD.ResyncPeriod
+
+	result.SuperUsername = fromCRD.PostgresUsersConfiguration.SuperUsername
+	result.ReplicationUsername = fromCRD.PostgresUsersConfiguration.ReplicationUsername
+
+	result.PodServiceAccountName = fromCRD.Kubernetes.PodServiceAccountName
+	result.PodServiceAccountDefinition = fromCRD.Kubernetes.PodServiceAccountDefinition
+	result.PodTerminateGracePeriod = fromCRD.Kubernetes.PodTerminateGracePeriod
+	result.WatchedNamespace = fromCRD.Kubernetes.WatchedNamespace
+	result.PDBNameFormat = fromCRD.Kubernetes.PDBNameFormat
+	result.SecretNameTemplate = fromCRD.Kubernetes.SecretNameTemplate
+	result.OAuthTokenSecretName = fromCRD.Kubernetes.OAuthTokenSecretName
+	result.InfrastructureRolesSecretName = fromCRD.Kubernetes.InfrastructureRolesSecretName
+	result.PodRoleLabel = fromCRD.Kubernetes.PodRoleLabel
+	result.ClusterLabels = fromCRD.Kubernetes.ClusterLabels
+	result.ClusterNameLabel = fromCRD.Kubernetes.ClusterNameLabel
+	result.NodeReadinessLabel = fromCRD.Kubernetes.NodeReadinessLabel
+
+	result.DefaultCPURequest = fromCRD.PostgresPodResources.DefaultCPURequest
+	result.DefaultMemoryRequest = fromCRD.PostgresPodResources.DefaultMemoryRequest
+	result.DefaultCPULimit = fromCRD.PostgresPodResources.DefaultCPULimit
+	result.DefaultMemoryLimit = fromCRD.PostgresPodResources.DefaultMemoryLimit
+
+	result.ResourceCheckInterval = fromCRD.Timeouts.ResourceCheckInterval
+	result.ResourceCheckTimeout = fromCRD.Timeouts.ResourceCheckTimeout
+	result.PodLabelWaitTimeout = fromCRD.Timeouts.PodLabelWaitTimeout
+	result.PodDeletionWaitTimeout = fromCRD.Timeouts.PodDeletionWaitTimeout
+	result.ReadyWaitInterval = fromCRD.Timeouts.ReadyWaitInterval
+	result.ReadyWaitTimeout = fromCRD.Timeouts.ReadyWaitTimeout
+
+	result.DbHostedZone = fromCRD.LoadBalancer.DbHostedZone
+	result.EnableMasterLoadBalancer = fromCRD.LoadBalancer.EnableMasterLoadBalancer
+	result.EnableReplicaLoadBalancer = fromCRD.LoadBalancer.EnableReplicaLoadBalancer
+	result.MasterDNSNameFormat = fromCRD.LoadBalancer.MasterDNSNameFormat
+	result.ReplicaDNSNameFormat = fromCRD.LoadBalancer.ReplicaDNSNameFormat
+
+	result.WALES3Bucket = fromCRD.AWSGCP.WALES3Bucket
+	result.LogS3Bucket = fromCRD.AWSGCP.LogS3Bucket
+	result.KubeIAMRole = fromCRD.AWSGCP.KubeIAMRole
+
+	result.DebugLogging = fromCRD.OperatorDebug.DebugLogging
+	result.EnableDBAccess = fromCRD.OperatorDebug.EnableDBAccess
+	result.EnableTeamsAPI = fromCRD.TeamsAPI.EnableTeamsAPI
+	result.TeamsAPIUrl = fromCRD.TeamsAPI.TeamsAPIUrl
+	result.TeamAPIRoleConfiguration = fromCRD.TeamsAPI.TeamAPIRoleConfiguration
+	result.EnableTeamSuperuser = fromCRD.TeamsAPI.EnableTeamSuperuser
+	result.TeamAdminRole = fromCRD.TeamsAPI.TeamAdminRole
+	result.PamRoleName = fromCRD.TeamsAPI.PamRoleName
+
+	result.APIPort = fromCRD.LoggingRESTAPI.APIPort
+	result.RingLogLines = fromCRD.LoggingRESTAPI.RingLogLines
+	result.ClusterHistoryEntries = fromCRD.LoggingRESTAPI.ClusterHistoryEntries
+
+	result.ScalyrAPIKey = fromCRD.Scalyr.ScalyrAPIKey
+	result.ScalyrImage = fromCRD.Scalyr.ScalyrImage
+	result.ScalyrServerURL = fromCRD.Scalyr.ScalyrServerURL
+	result.ScalyrCPURequest = fromCRD.Scalyr.ScalyrCPURequest
+	result.ScalyrMemoryRequest = fromCRD.Scalyr.ScalyrMemoryRequest
+	result.ScalyrCPULimit = fromCRD.Scalyr.ScalyrCPULimit
+	result.ScalyrMemoryLimit = fromCRD.Scalyr.ScalyrMemoryLimit
+
+	return result
+}

pkg/controller/util.go

@@ -75,7 +75,7 @@ func (c *Controller) createZalandoCRD(plural, singular, short string) error {
 		c.logger.Infof("customResourceDefinition %q has been registered", crd.Name)
 	}
 
-	return wait.Poll(c.opConfig.CRD.ReadyWaitInterval, c.opConfig.CRD.ReadyWaitTimeout, func() (bool, error) {
+	return wait.Poll(c.config.CRDReadyWaitInterval, c.config.CRDReadyWaitTimeout, func() (bool, error) {
 		c, err := c.KubeClient.CustomResourceDefinitions().Get(crd.Name, metav1.GetOptions{})
 		if err != nil {
 			return false, err