remove standby leader configurable variable

charts/postgres-operator/crds/operatorconfigurations.yaml

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

charts/postgres-operator/values.yaml

@@ -195,7 +195,6 @@ configKubernetes:
   # label assigned to the Postgres pods (and services/endpoints)
   pod_role_label: spilo-role
   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
   # pod_service_account_definition: ""
 

delivery.yaml

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

docs/reference/operator_parameters.md

@@ -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.
   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**
   list of `name:value` pairs for additional labels assigned to the cluster
   objects. The default is `application:spilo`.

manifests/configmap.yaml

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

manifests/operatorconfiguration.crd.yaml

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

manifests/postgresql-operator-default-configuration.yaml

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

pkg/apis/acid.zalan.do/v1/crds.go

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

pkg/apis/acid.zalan.do/v1/operator_configuration_type.go

@@ -82,7 +82,6 @@ type KubernetesMetaConfiguration struct {
 	InfrastructureRolesDefs                []*config.InfrastructureRole `json:"infrastructure_roles_secrets,omitempty"`
 	PodRoleLabel                           string                       `json:"pod_role_label,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"`
 	InheritedLabels                        []string                     `json:"inherited_labels,omitempty"`
 	InheritedAnnotations                   []string                     `json:"inherited_annotations,omitempty"`

pkg/cluster/k8sres.go

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