Use the Operator namespace when looking up secret (CrunchyData#788)

'pgo-backrest-repo-config' when enabling S3 support

Author: andrewlecuyer

operator/clusterutilities.go

@@ -367,7 +367,7 @@ func GetPgbackrestS3EnvVars(backrestLabel, backRestStorageTypeLabel string,
 			PgbackrestS3Region:   Pgo.Cluster.BackrestS3Region,
 		}
 
-		secret, secretExists, err := kubeapi.GetSecret(clientset, "pgo-backrest-repo-config", ns)
+		secret, secretExists, err := kubeapi.GetSecret(clientset, "pgo-backrest-repo-config", PgoNamespace)
 		if err != nil {
 			log.Error(err.Error())
 			return ""

operator/common.go

@@ -29,14 +29,16 @@ import (
 var CRUNCHY_DEBUG bool
 var NAMESPACE string
 
+var PgoNamespace string
+
 var Pgo config.PgoConfig
 
 type containerResourcesTemplateFields struct {
 	RequestsMemory, RequestsCPU string
 	LimitsMemory, LimitsCPU     string
 }
 
-func Initialize(clientset *kubernetes.Clientset, namespace string) {
+func Initialize(clientset *kubernetes.Clientset) {
 
 	tmp := os.Getenv("CRUNCHY_DEBUG")
 	if tmp == "true" {
@@ -53,9 +55,15 @@ func Initialize(clientset *kubernetes.Clientset, namespace string) {
 		log.Error("NAMESPACE env var is set to empty string which pgo intprets as meaning you want it to watch 'all' namespaces.")
 	}
 
+	PgoNamespace = os.Getenv("PGO_OPERATOR_NAMESPACE")
+	if PgoNamespace == "" {
+		log.Error("PGO_OPERATOR_NAMESPACE environment variable is not set and is required, this is the namespace that the Operator is to run within.")
+		os.Exit(2)
+	}
+
 	var err error
 
-	err = Pgo.GetConfig(clientset, namespace)
+	err = Pgo.GetConfig(clientset, PgoNamespace)
 	if err != nil {
 		log.Error(err)
 		log.Error("pgo-config files and templates did not load")

postgres-operator.go

@@ -37,7 +37,6 @@ import (
 )
 
 var Clientset *kubernetes.Clientset
-var PgoNamespace string
 
 func main() {
 	kubeconfig := flag.String("kubeconfig", "", "Path to a kube config. Only required if out-of-cluster.")
@@ -51,12 +50,6 @@ func main() {
 		log.Info("debug flag set to false")
 	}
 
-	PgoNamespace = os.Getenv("PGO_OPERATOR_NAMESPACE")
-	if PgoNamespace == "" {
-		log.Error("PGO_OPERATOR_NAMESPACE environment variable is not set and is required, this is the namespace that the Operator is to run within.")
-		os.Exit(2)
-	}
-
 	namespaceList := util.GetNamespaces()
 	log.Debugf("watching the following namespaces: [%v]", namespaceList)
 
@@ -81,7 +74,7 @@ func main() {
 		os.Exit(2)
 	}
 
-	operator.Initialize(Clientset, PgoNamespace)
+	operator.Initialize(Clientset)
 
 	//validate the NAMESPACE env var
 	err = util.ValidateNamespaces(Clientset)