fix pgbadger target on Addon to specify actual deployment name instead of clustername (CrunchyData#805)

Jeff McCormick · web-flow · commit cef93996cbb8 · 2019-06-05T15:33:43.000-05:00
diff --git a/operator/backrest/restore.go b/operator/backrest/restore.go
@@ -424,7 +424,7 @@ func CreateRestoredDeployment(restclient *rest.RESTClient, cluster *crv1.Pgclust
 		ContainerResources:      operator.GetContainerResourcesJSON(&cluster.Spec.ContainerResources),
 		ConfVolume:              operator.GetConfVolume(clientset, cluster, namespace),
 		CollectAddon:            operator.GetCollectAddon(clientset, namespace, &cluster.Spec),
-		BadgerAddon:             operator.GetBadgerAddon(clientset, namespace, cluster),
+		BadgerAddon:             operator.GetBadgerAddon(clientset, namespace, cluster, restoreToName),
 		PgbackrestEnvVars: operator.GetPgbackrestEnvVars(cluster.Labels[config.LABEL_BACKREST], cluster.Spec.ClusterName, restoreToName,
 			cluster.Spec.Port, cluster.Spec.UserLabels[config.LABEL_BACKREST_STORAGE_TYPE]),
 		PgbackrestS3EnvVars: operator.GetPgbackrestS3EnvVars(cluster.Labels[config.LABEL_BACKREST],
diff --git a/operator/cluster/clusterlogic.go b/operator/cluster/clusterlogic.go
@@ -133,7 +133,7 @@ func AddCluster(clientset *kubernetes.Clientset, client *rest.RESTClient, cl *cr
 		ContainerResources:      operator.GetContainerResourcesJSON(&cl.Spec.ContainerResources),
 		ConfVolume:              operator.GetConfVolume(clientset, cl, namespace),
 		CollectAddon:            operator.GetCollectAddon(clientset, namespace, &cl.Spec),
-		BadgerAddon:             operator.GetBadgerAddon(clientset, namespace, cl),
+		BadgerAddon:             operator.GetBadgerAddon(clientset, namespace, cl, cl.Spec.Name),
 		PgmonitorEnvVars:        operator.GetPgmonitorEnvVars(cl.Spec.UserLabels[config.LABEL_COLLECT]),
 		PgbackrestEnvVars: operator.GetPgbackrestEnvVars(cl.Labels[config.LABEL_BACKREST], cl.Spec.ClusterName, cl.Spec.Name,
 			cl.Spec.Port, cl.Spec.UserLabels[config.LABEL_BACKREST_STORAGE_TYPE]),
@@ -336,7 +336,7 @@ func Scale(clientset *kubernetes.Clientset, client *rest.RESTClient, replica *cr
 		ContainerResources:      operator.GetContainerResourcesJSON(&cs),
 		NodeSelector:            operator.GetReplicaAffinity(cluster.Spec.UserLabels, replica.Spec.UserLabels),
 		CollectAddon:            operator.GetCollectAddon(clientset, namespace, &cluster.Spec),
-		BadgerAddon:             operator.GetBadgerAddon(clientset, namespace, cluster),
+		BadgerAddon:             operator.GetBadgerAddon(clientset, namespace, cluster, replica.Spec.Name),
 		PgmonitorEnvVars:        operator.GetPgmonitorEnvVars(cluster.Spec.UserLabels[config.LABEL_COLLECT]),
 		PgbackrestEnvVars: operator.GetPgbackrestEnvVars(cluster.Labels[config.LABEL_BACKREST], replica.Spec.ClusterName, replica.Spec.Name,
 			cluster.Spec.Port, cluster.Spec.UserLabels[config.LABEL_BACKREST_STORAGE_TYPE]),
diff --git a/operator/clusterutilities.go b/operator/clusterutilities.go
@@ -148,15 +148,15 @@ func GetPgbackrestEnvVars(backrestEnabled, clusterName, depName, port, storageTy
 
 }
 
-func GetBadgerAddon(clientset *kubernetes.Clientset, namespace string, cluster *crv1.Pgcluster) string {
+func GetBadgerAddon(clientset *kubernetes.Clientset, namespace string, cluster *crv1.Pgcluster, pgbadger_target string) string {
 
 	spec := cluster.Spec
 
 	if cluster.Labels[config.LABEL_BADGER] == "true" {
 		log.Debug("crunchy_badger was found as a label on cluster create")
 		badgerTemplateFields := badgerTemplateFields{}
 		badgerTemplateFields.CCPImageTag = spec.CCPImageTag
-		badgerTemplateFields.BadgerTarget = spec.Name
+		badgerTemplateFields.BadgerTarget = pgbadger_target
 		badgerTemplateFields.CCPImagePrefix = Pgo.Cluster.CCPImagePrefix
 		badgerTemplateFields.ContainerResources = ""
 
