public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

more configurable variables

This commit is contained in:
inovindasari 2024-11-25 14:56:45 +01:00
parent 8b79e33b1c
commit a2328b9ec8
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/cluster/k8sres.go
View File

@ -955,9 +955,9 @@ func (c *Cluster) generateSpiloPodEnvVars(
Value: c.OpConfig.PodLeaderLabelValue, Value: c.OpConfig.PodLeaderLabelValue,
}, },
{ {
Name: "KUBERNETES_STANDBY_LEADER_LABEL_VALUE", Name: "KUBERNETES_STANDBY_LEADER_LABEL_VALUE",
Value: c.OpConfig.PodStandbyLeaderLabelValue, Value: c.OpConfig.PodStandbyLeaderLabelValue,
} },
{ {
Name: "PGPASSWORD_SUPERUSER", Name: "PGPASSWORD_SUPERUSER",
ValueFrom: &v1.EnvVarSource{ ValueFrom: &v1.EnvVarSource{

2
pkg/controller/operator_config.go
View File

@ -110,6 +110,8 @@ func (c *Controller) importConfigurationFromCRD(fromCRD *acidv1.OperatorConfigur
} }
result.PodRoleLabel = util.Coalesce(fromCRD.Kubernetes.PodRoleLabel, "spilo-role") 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.ClusterLabels = util.CoalesceStrMap(fromCRD.Kubernetes.ClusterLabels, map[string]string{"application": "spilo"})
result.InheritedLabels = fromCRD.Kubernetes.InheritedLabels result.InheritedLabels = fromCRD.Kubernetes.InheritedLabels
result.InheritedAnnotations = fromCRD.Kubernetes.InheritedAnnotations result.InheritedAnnotations = fromCRD.Kubernetes.InheritedAnnotations