Add topologySpreadConstraints configuration.

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

@@ -1303,6 +1303,9 @@ var OperatorConfigCRDResourceValidation = apiextv1.CustomResourceValidation{
  "enable_sidecars": {
  Type: "boolean",
  },
+ "enable_topology_spread_constraints": {
+ Type: "boolean",
+ },
  "ignored_annotations": {
  Type: "array",
  Items: &apiextv1.JSONSchemaPropsOrArray{
@@ -1508,6 +1511,74 @@ var OperatorConfigCRDResourceValidation = apiextv1.CustomResourceValidation{
  },
  },
  },
+ "topology_spread_constraints": {
+ Type: "array",
+ Nullable: true,
+ Items: &apiextv1.JSONSchemaPropsOrArray{
+ Schema: &apiextv1.JSONSchemaProps{
+ Type: "object",
+ Required: []string{"max_skew", "topology_key", "when_unsatisfiable"},
+ Properties: map[string]apiextv1.JSONSchemaProps{
+ "max_skew": {
+ Type: "integer",
+ Format: "int32",
+ },
+ "topology_key": {
+ Type: "string",
+ },
+ "when_unsatisfiable": {
+ Type: "string",
+ Enum: []apiextv1.JSON{
+ {
+ Raw: []byte(`"DoNotSchedule"`),
+ },
+ {
+ Raw: []byte(`"ScheduleAnyway"`),
+ },
+ },
+ },
+ "min_domains": {
+ Type: "integer",
+ Nullable: true,
+ Format: "int32",
+ },
+ "node_affinity_policy": {
+ Type: "string",
+ Nullable: true,
+ Enum: []apiextv1.JSON{
+ {
+ Raw: []byte(`"Ignore"`),
+ },
+ {
+ Raw: []byte(`"Honor"`),
+ },
+ },
+ },
+ "node_taints_policy": {
+ Type: "string",
+ Nullable: true,
+ Enum: []apiextv1.JSON{
+ {
+ Raw: []byte(`"Ignore"`),
+ },
+ {
+ Raw: []byte(`"Honor"`),
+ },
+ },
+ },
+ "match_label_keys": {
+ Type: "array",
+ Nullable: true,
+ Items: &apiextv1.JSONSchemaPropsOrArray{
+ Schema: &apiextv1.JSONSchemaProps{
+ Type: "string",
+ },
+ },
+ },
+ },
+ },
+ },
+ },
  "watched_namespace": {
  Type: "string",
  },

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

@@ -91,18 +91,20 @@ type KubernetesMetaConfiguration struct {
  NodeReadinessLabelMerge string `json:"node_readiness_label_merge,omitempty"`
  CustomPodAnnotations map[string]string `json:"custom_pod_annotations,omitempty"`
  // TODO: use a proper toleration structure?
- PodToleration map[string]string `json:"toleration,omitempty"`
- PodEnvironmentConfigMap spec.NamespacedName `json:"pod_environment_configmap,omitempty"`
- PodEnvironmentSecret string `json:"pod_environment_secret,omitempty"`
- PodPriorityClassName string `json:"pod_priority_class_name,omitempty"`
- MasterPodMoveTimeout Duration `json:"master_pod_move_timeout,omitempty"`
- EnablePodAntiAffinity bool `json:"enable_pod_antiaffinity,omitempty"`
- PodAntiAffinityPreferredDuringScheduling bool `json:"pod_antiaffinity_preferred_during_scheduling,omitempty"`
- PodAntiAffinityTopologyKey string `json:"pod_antiaffinity_topology_key,omitempty"`
- PodManagementPolicy string `json:"pod_management_policy,omitempty"`
- PersistentVolumeClaimRetentionPolicy map[string]string `json:"persistent_volume_claim_retention_policy,omitempty"`
- EnableReadinessProbe bool `json:"enable_readiness_probe,omitempty"`
- EnableCrossNamespaceSecret bool `json:"enable_cross_namespace_secret,omitempty"`
+ PodToleration map[string]string `json:"toleration,omitempty"`
+ PodEnvironmentConfigMap spec.NamespacedName `json:"pod_environment_configmap,omitempty"`
+ PodEnvironmentSecret string `json:"pod_environment_secret,omitempty"`
+ PodPriorityClassName string `json:"pod_priority_class_name,omitempty"`
+ MasterPodMoveTimeout Duration `json:"master_pod_move_timeout,omitempty"`
+ EnablePodAntiAffinity bool `json:"enable_pod_antiaffinity,omitempty"`
+ PodAntiAffinityPreferredDuringScheduling bool `json:"pod_antiaffinity_preferred_during_scheduling,omitempty"`
+ PodAntiAffinityTopologyKey string `json:"pod_antiaffinity_topology_key,omitempty"`
+ PodManagementPolicy string `json:"pod_management_policy,omitempty"`
+ PersistentVolumeClaimRetentionPolicy map[string]string `json:"persistent_volume_claim_retention_policy,omitempty"`
+ EnableReadinessProbe bool `json:"enable_readiness_probe,omitempty"`
+ EnableCrossNamespaceSecret bool `json:"enable_cross_namespace_secret,omitempty"`
+ EnableTopologySpreadConstraints bool `json:"enable_topology_spread_constraints,omitempty"`
+ TopologySpreadConstraints []*config.TopologySpreadConstraint `json:"topology_spread_constraints,omitempty"`
 }
 
 // PostgresPodResourcesDefaults defines the spec of default resources

pkg/cluster/k8sres.go

@@ -572,6 +572,36 @@ func generatePodAntiAffinity(podAffinityTerm v1.PodAffinityTerm, preferredDuring
  return podAntiAffinity
 }
 
+func generateTopologySpreadConstraints(labels labels.Set, topologySpreadConstraintObjs []*config.TopologySpreadConstraint) []v1.TopologySpreadConstraint {
+ var topologySpreadConstraints []v1.TopologySpreadConstraint
+ var nodeAffinityPolicy *v1.NodeInclusionPolicy
+ var nodeTaintsPolicy *v1.NodeInclusionPolicy
+ for _, topologySpreadConstraintObj := range topologySpreadConstraintObjs {
+ if topologySpreadConstraintObj.NodeAffinityPolicy != nil {
+ nodeAffinityPolicy = (*v1.NodeInclusionPolicy)(topologySpreadConstraintObj.NodeAffinityPolicy)
+ }
+ if topologySpreadConstraintObj.NodeTaintsPolicy != nil {
+ nodeTaintsPolicy = (*v1.NodeInclusionPolicy)(topologySpreadConstraintObj.NodeTaintsPolicy)
+ }
+ topologySpreadConstraint := v1.TopologySpreadConstraint{
+ MaxSkew: topologySpreadConstraintObj.MaxSkew,
+ TopologyKey: topologySpreadConstraintObj.TopologyKey,
+ WhenUnsatisfiable: v1.UnsatisfiableConstraintAction(topologySpreadConstraintObj.WhenUnsatisfiable),
+ LabelSelector: &metav1.LabelSelector{
+ MatchLabels: labels,
+ },
+ MinDomains: topologySpreadConstraintObj.MinDomains,
+ NodeAffinityPolicy: nodeAffinityPolicy,
+ NodeTaintsPolicy: nodeTaintsPolicy,
+ MatchLabelKeys: topologySpreadConstraintObj.MatchLabelKeys,
+ }
+ topologySpreadConstraints = append(topologySpreadConstraints, topologySpreadConstraint)
+ nodeAffinityPolicy = nil
+ nodeTaintsPolicy = nil
+ }
+ return topologySpreadConstraints
+}
+
 func tolerations(tolerationsSpec *[]v1.Toleration, podToleration map[string]string) []v1.Toleration {
  // allow to override tolerations by postgresql manifest
  if len(*tolerationsSpec) > 0 {
@@ -788,6 +818,8 @@ func (c *Cluster) generatePodTemplate(
  additionalSecretMount string,
  additionalSecretMountPath string,
  additionalVolumes []acidv1.AdditionalVolume,
+ topologySpreadConstraint bool,
+ topologySpreadConstraintsArr []*config.TopologySpreadConstraint,
 ) (*v1.PodTemplateSpec, error) {
 
  terminateGracePeriodSeconds := terminateGracePeriod
@@ -836,6 +868,10 @@ func (c *Cluster) generatePodTemplate(
  podSpec.Affinity = nodeAffinity
  }
 
+ if topologySpreadConstraint && len(topologySpreadConstraintsArr) > 0 {
+ podSpec.TopologySpreadConstraints = generateTopologySpreadConstraints(labels, topologySpreadConstraintsArr)
+ }
+
  if priorityClassName != "" {
  podSpec.PriorityClassName = priorityClassName
  }
@@ -1412,7 +1448,9 @@ func (c *Cluster) generateStatefulSet(spec *acidv1.PostgresSpec) (*appsv1.Statef
  c.OpConfig.PodAntiAffinityPreferredDuringScheduling,
  c.OpConfig.AdditionalSecretMount,
  c.OpConfig.AdditionalSecretMountPath,
- additionalVolumes)
+ additionalVolumes,
+ c.OpConfig.EnableTopologySpreadConstraints,
+ c.OpConfig.TopologySpreadConstraints)
 
  if err != nil {
  return nil, fmt.Errorf("could not generate pod template: %v", err)
@@ -2233,7 +2271,9 @@ func (c *Cluster) generateLogicalBackupJob() (*batchv1.CronJob, error) {
  false,
  c.OpConfig.AdditionalSecretMount,
  c.OpConfig.AdditionalSecretMountPath,
- []acidv1.AdditionalVolume{}); err != nil {
+ []acidv1.AdditionalVolume{},
+ false,
+ []*config.TopologySpreadConstraint{}); err != nil {
  return nil, fmt.Errorf("could not generate pod template for logical backup pod: %v", err)
  }
 

pkg/controller/operator_config.go

@@ -282,5 +282,23 @@ func (c *Controller) importConfigurationFromCRD(fromCRD *acidv1.OperatorConfigur
  fromCRD.ConnectionPooler.MaxDBConnections,
  k8sutil.Int32ToPointer(constants.ConnectionPoolerMaxDBConnections))
 
+ result.EnableTopologySpreadConstraints = fromCRD.Kubernetes.EnableTopologySpreadConstraints
+ if fromCRD.Kubernetes.TopologySpreadConstraints != nil {
+ result.TopologySpreadConstraints = []*config.TopologySpreadConstraint{}
+ for _, topologySpreadConstraint := range fromCRD.Kubernetes.TopologySpreadConstraints {
+ result.TopologySpreadConstraints = append(
+ result.TopologySpreadConstraints,
+ &config.TopologySpreadConstraint{
+ MaxSkew: topologySpreadConstraint.MaxSkew,
+ TopologyKey: topologySpreadConstraint.TopologyKey,
+ WhenUnsatisfiable: topologySpreadConstraint.WhenUnsatisfiable,
+ MinDomains: topologySpreadConstraint.MinDomains,
+ NodeAffinityPolicy: topologySpreadConstraint.NodeAffinityPolicy,
+ NodeTaintsPolicy: topologySpreadConstraint.NodeTaintsPolicy,
+ MatchLabelKeys: topologySpreadConstraint.MatchLabelKeys,
+ })
+ }
+ }
+
  return result
 }