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

remove standby leader configurable variable

This commit is contained in:
inovindasari 2024-11-27 15:40:30 +01:00
parent a48b5b6fb6
commit 910c7ee516
10 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
charts/postgres-operator/crds/operatorconfigurations.yaml
View File

@ -330,9 +330,6 @@ spec:
pod_leader_label_value: pod_leader_label_value:
type: string type: string
default: "master" default: "master"
pod_standby_leader_label_value:
type: string
default: "master"
pod_service_account_definition: pod_service_account_definition:
type: string type: string
default: "" default: ""

1
charts/postgres-operator/values.yaml
View File

@ -195,7 +195,6 @@ configKubernetes:
# label assigned to the Postgres pods (and services/endpoints) # label assigned to the Postgres pods (and services/endpoints)
pod_role_label: spilo-role pod_role_label: spilo-role
pod_leader_label_value: master pod_leader_label_value: master
pod_standby_leader_label_value: master
# service account definition as JSON/YAML string to be used by postgres cluster pods # service account definition as JSON/YAML string to be used by postgres cluster pods
# pod_service_account_definition: "" # pod_service_account_definition: ""

3
delivery.yaml
View File

@ -14,9 +14,6 @@ pipeline:
- desc: Run unit tests - desc: Run unit tests
cmd: | cmd: |
make deps mocks test make deps mocks test
- desc: 'Run e2e tests'
cmd: |
make e2e
- desc: Build Docker image - desc: Build Docker image
cmd: | cmd: |
IS_PR_BUILD=${CDP_PULL_REQUEST_NUMBER+"true"} IS_PR_BUILD=${CDP_PULL_REQUEST_NUMBER+"true"}

4
docs/reference/operator_parameters.md
View File

@ -441,10 +441,6 @@ configuration they are grouped under the `kubernetes` key.
value of the pod label if Postgres role is primary when running on Kubernetes. value of the pod label if Postgres role is primary when running on Kubernetes.
The default is 'master'. The default is 'master'.
* **pod_standby_leader_label_value**
value of the pod label if Postgres role is standby_leader when running on Kubernetes.
The default is 'master'.
* **cluster_labels** * **cluster_labels**
list of `name:value` pairs for additional labels assigned to the cluster list of `name:value` pairs for additional labels assigned to the cluster
objects. The default is `application:spilo`. objects. The default is `application:spilo`.

1
manifests/configmap.yaml
View File

@ -135,7 +135,6 @@ data:
# pod_priority_class_name: "postgres-pod-priority" # pod_priority_class_name: "postgres-pod-priority"
pod_role_label: spilo-role pod_role_label: spilo-role
pod_leader_label_value: master pod_leader_label_value: master
pod_standby_leader_label_value: master
pod_service_account_definition: "" pod_service_account_definition: ""
pod_service_account_name: "postgres-pod" pod_service_account_name: "postgres-pod"
pod_service_account_role_binding_definition: "" pod_service_account_role_binding_definition: ""

3
manifests/operatorconfiguration.crd.yaml
View File

@ -328,9 +328,6 @@ spec:
pod_leader_label_value: pod_leader_label_value:
type: string type: string
default: "master" default: "master"
pod_standby_leader_label_value:
type: string
default: "master"
pod_service_account_definition: pod_service_account_definition:
type: string type: string
default: "" default: ""

1
manifests/postgresql-operator-default-configuration.yaml
View File

@ -100,7 +100,6 @@ configuration:
# pod_priority_class_name: "postgres-pod-priority" # pod_priority_class_name: "postgres-pod-priority"
pod_role_label: spilo-role pod_role_label: spilo-role
pod_leader_label_value: master pod_leader_label_value: master
pod_standby_leader_label_value: master
# pod_service_account_definition: "" # pod_service_account_definition: ""
pod_service_account_name: postgres-pod pod_service_account_name: postgres-pod
# pod_service_account_role_binding_definition: "" # pod_service_account_role_binding_definition: ""

3
pkg/apis/acid.zalan.do/v1/crds.go
View File

@ -1500,9 +1500,6 @@ var OperatorConfigCRDResourceValidation = apiextv1.CustomResourceValidation{
"pod_leader_label_value": { "pod_leader_label_value": {
Type: "string", Type: "string",
}, },
"pod_standby_leader_label_value": {
Type: "string",
},
"pod_service_account_definition": { "pod_service_account_definition": {
Type: "string", Type: "string",
}, },

1
pkg/apis/acid.zalan.do/v1/operator_configuration_type.go
View File

@ -82,7 +82,6 @@ type KubernetesMetaConfiguration struct {
InfrastructureRolesDefs []*config.InfrastructureRole `json:"infrastructure_roles_secrets,omitempty"` InfrastructureRolesDefs []*config.InfrastructureRole `json:"infrastructure_roles_secrets,omitempty"`
PodRoleLabel string `json:"pod_role_label,omitempty"` PodRoleLabel string `json:"pod_role_label,omitempty"`
PodLeaderLabelValue string `json:"pod_leader_label_value,omitempty"` PodLeaderLabelValue string `json:"pod_leader_label_value,omitempty"`
PodStandbyLeaderLabelValue string `json:"pod_standby_leader_label_value,omitempty"`
ClusterLabels map[string]string `json:"cluster_labels,omitempty"` ClusterLabels map[string]string `json:"cluster_labels,omitempty"`
InheritedLabels []string `json:"inherited_labels,omitempty"` InheritedLabels []string `json:"inherited_labels,omitempty"`
InheritedAnnotations []string `json:"inherited_annotations,omitempty"` InheritedAnnotations []string `json:"inherited_annotations,omitempty"`

2
pkg/cluster/k8sres.go
View File

@ -956,7 +956,7 @@ func (c *Cluster) generateSpiloPodEnvVars(
}, },
{ {
Name: "KUBERNETES_STANDBY_LEADER_LABEL_VALUE", Name: "KUBERNETES_STANDBY_LEADER_LABEL_VALUE",
Value: c.OpConfig.PodStandbyLeaderLabelValue, Value: c.OpConfig.PodLeaderLabelValue,
}, },
{ {
Name: "PGPASSWORD_SUPERUSER", Name: "PGPASSWORD_SUPERUSER",