more configurable variables

idanovinda · idanovinda · commit a2328b9ec897 · 2024-11-25T14:56:45.000+01:00
diff --git a/pkg/cluster/k8sres.go b/pkg/cluster/k8sres.go
@@ -955,9 +955,9 @@ func (c *Cluster) generateSpiloPodEnvVars(
 			Value: c.OpConfig.PodLeaderLabelValue,
 		},
 		{
-			Name: "KUBERNETES_STANDBY_LEADER_LABEL_VALUE",
+			Name:  "KUBERNETES_STANDBY_LEADER_LABEL_VALUE",
 			Value: c.OpConfig.PodStandbyLeaderLabelValue,
-		}
+		},
 		{
 			Name: "PGPASSWORD_SUPERUSER",
 			ValueFrom: &v1.EnvVarSource{
diff --git a/pkg/controller/operator_config.go b/pkg/controller/operator_config.go
@@ -110,6 +110,8 @@ func (c *Controller) importConfigurationFromCRD(fromCRD *acidv1.OperatorConfigur
 	}
 
 	result.PodRoleLabel = util.Coalesce(fromCRD.Kubernetes.PodRoleLabel, "spilo-role")
+	result.PodLeaderLabelValue = util.Coalesce(fromCRD.Kubernetes.PodLeaderLabelValue, "master")
+	result.PodStandbyLeaderLabelValue = util.Coalesce(fromCRD.Kubernetes.PodStandbyLeaderLabelValue, "master")
 	result.ClusterLabels = util.CoalesceStrMap(fromCRD.Kubernetes.ClusterLabels, map[string]string{"application": "spilo"})
 	result.InheritedLabels = fromCRD.Kubernetes.InheritedLabels
 	result.InheritedAnnotations = fromCRD.Kubernetes.InheritedAnnotations

Original file line number	Diff line number	Diff line change
`@@ -955,9 +955,9 @@ func (c *Cluster) generateSpiloPodEnvVars(`
`955`	`955`	`Value: c.OpConfig.PodLeaderLabelValue,`
`956`	`956`	`},`
`957`	`957`	`{`
`958`		`- Name: "KUBERNETES_STANDBY_LEADER_LABEL_VALUE",`
	`958`	`+ Name: "KUBERNETES_STANDBY_LEADER_LABEL_VALUE",`
`959`	`959`	`Value: c.OpConfig.PodStandbyLeaderLabelValue,`
`960`		`- }`
	`960`	`+ },`
`961`	`961`	`{`
`962`	`962`	`Name: "PGPASSWORD_SUPERUSER",`
`963`	`963`	`ValueFrom: &v1.EnvVarSource{`
Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,8 @@ func (c Controller) importConfigurationFromCRD(fromCRD acidv1.OperatorConfigur`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`result.PodRoleLabel = util.Coalesce(fromCRD.Kubernetes.PodRoleLabel, "spilo-role")`
	`113`	`+ result.PodLeaderLabelValue = util.Coalesce(fromCRD.Kubernetes.PodLeaderLabelValue, "master")`
	`114`	`+ result.PodStandbyLeaderLabelValue = util.Coalesce(fromCRD.Kubernetes.PodStandbyLeaderLabelValue, "master")`
`113`	`115`	`result.ClusterLabels = util.CoalesceStrMap(fromCRD.Kubernetes.ClusterLabels, map[string]string{"application": "spilo"})`
`114`	`116`	`result.InheritedLabels = fromCRD.Kubernetes.InheritedLabels`
`115`	`117`	`result.InheritedAnnotations = fromCRD.Kubernetes.InheritedAnnotations`