Update logic for obtaining the global

andrewlecuyer · jkatz · commit 625557d580a1 · 2019-12-30T09:29:18.000-06:00
custom configuration configMap to
pull from the proper (i.e. cluster)
namespace, and to ensure a user
provided custom configMap takes
precedence over the global
configMap (if available).
diff --git a/operator/cluster/clusterlogic.go b/operator/cluster/clusterlogic.go
@@ -19,10 +19,11 @@ package cluster
 */
 
 import (
-	"strings"
 	"bytes"
 	"encoding/json"
+	"fmt"
 	"os"
+	"strings"
 	"time"
 
 	crv1 "github.com/crunchydata/postgres-operator/apis/cr/v1"
@@ -154,20 +155,22 @@ func AddCluster(clientset *kubernetes.Clientset, client *rest.RESTClient, cl *cr
 		operator.AddDefaultPostgresHaConfigMap(clientset, cl, deploymentFields.IsInit, true, namespace)
 	} else {
 		configMap, found := kubeapi.GetConfigMap(clientset, strings.Trim(deploymentFields.ConfVolume, "\""), namespace)
-		if found {
-			if _, exists := configMap.Data[config.PostgresHaTemplatePath]; !exists {
-				log.Debugf("Custom postgres-ha config file not found in custom configMap, " +
-					"creating default configMap with default postgres-ha config file")
-				operator.AddDefaultPostgresHaConfigMap(clientset, cl, deploymentFields.IsInit, true, namespace)
-			} else {
-				log.Debugf("Custom postgres-ha config file found in custom configMap, " +
-					"creating default configMap without default postgres-ha config file")
-				operator.AddDefaultPostgresHaConfigMap(clientset, cl, deploymentFields.IsInit, false, namespace)
-			}
-		} else {
+		if !found {
+			err = fmt.Errorf("Unable to find custom configMap %s configured for deplyment %s when "+
+				"creating the default postgres-ha config file", deploymentFields.ConfVolume,
+				deploymentFields.Name)
 			log.Error(err.Error())
 			return err
 		}
+		if _, exists := configMap.Data[config.PostgresHaTemplatePath]; !exists {
+			log.Debugf("Custom postgres-ha config file not found in custom configMap, " +
+				"creating default configMap with default postgres-ha config file")
+			operator.AddDefaultPostgresHaConfigMap(clientset, cl, deploymentFields.IsInit, true, namespace)
+		} else {
+			log.Debugf("Custom postgres-ha config file found in custom configMap, " +
+				"creating default configMap without default postgres-ha config file")
+			operator.AddDefaultPostgresHaConfigMap(clientset, cl, deploymentFields.IsInit, false, namespace)
+		}
 	}
 
 	log.Debug("collectaddon value is [" + deploymentFields.CollectAddon + "]")
diff --git a/operator/clusterutilities.go b/operator/clusterutilities.go
@@ -258,25 +258,24 @@ func GetConfVolume(clientset *kubernetes.Clientset, cl *crv1.Pgcluster, namespac
 	var found bool
 	var configMapStr string
 
+	//check for user provided configmap
+	if cl.Spec.CustomConfig != "" {
+		_, found = kubeapi.GetConfigMap(clientset, cl.Spec.CustomConfig, namespace)
+		if !found {
+			//you should NOT get this error because of apiserver validation of this value!
+			log.Errorf("%s was not found, error, skipping user provided configMap", cl.Spec.CustomConfig)
+		} else {
+			log.Debugf("user provided configmap %s was used for this cluster", cl.Spec.CustomConfig)
+			return "\"" + cl.Spec.CustomConfig + "\""
+		}
+	}
+
 	//check for global custom configmap "pgo-custom-pg-config"
-	_, found = kubeapi.GetConfigMap(clientset, config.GLOBAL_CUSTOM_CONFIGMAP, PgoNamespace)
+	_, found = kubeapi.GetConfigMap(clientset, config.GLOBAL_CUSTOM_CONFIGMAP, namespace)
 	if found {
-		configMapStr = "\"pgo-custom-pg-config\""
-	} else {
-		log.Debug(config.GLOBAL_CUSTOM_CONFIGMAP + " was not found, skipping global configMap")
-
-		//check for user provided configmap
-		if cl.Spec.CustomConfig != "" {
-			_, found = kubeapi.GetConfigMap(clientset, cl.Spec.CustomConfig, namespace)
-			if !found {
-				//you should NOT get this error because of apiserver validation of this value!
-				log.Errorf("%s was not found, error, skipping user provided configMap", cl.Spec.CustomConfig)
-			} else {
-				log.Debugf("user provided configmap %s was used for this cluster", cl.Spec.CustomConfig)
-				configMapStr = "\"" + cl.Spec.CustomConfig + "\""
-			}
-		}
+		return "\"pgo-custom-pg-config\""
 	}
+	log.Debug(config.GLOBAL_CUSTOM_CONFIGMAP + " was not found, skipping global configMap")
 
 	return configMapStr
 }
