Skip to content

Make pod anti affinity topology key configurable #606

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 23, 2025
Merged

Make pod anti affinity topology key configurable #606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
217 changes: 115 additions & 102 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,54 +47,56 @@ import (
const (
// envPrefix = "pg"

metricsAddrSvcMgrFlg = "metrics-addr-svc-mgr"
metricsAddrCtrlMgrFlg = "metrics-addr-ctrl-mgr"
enableLeaderElectionFlg = "enable-leader-election"
partitionIDFlg = "partition-id"
tenantFlg = "tenant"
ctrlPlaneKubeConfifgFlg = "controlplane-kubeconfig"
loadBalancerIPFlg = "load-balancer-ip"
portRangeStartFlg = "port-range-start"
portRangeSizeFlg = "port-range-size"
customPSPNameFlg = "custom-psp-name"
storageClassFlg = "storage-class"
postgresImageFlg = "postgres-image"
etcdHostFlg = "etcd-host"
crdRegistrationFlg = "enable-crd-registration"
operatorImageFlg = "operator-image"
pgParamBlockListFlg = "postgres-param-blocklist" // nolint
majorVersionUpgradeModeFlg = "major-version-upgrade-mode"
standbyClustersSourceRangesFlg = "standby-clusters-source-ranges"
postgresletNamespaceFlg = "postgreslet-namespace"
sidecarsCMNameFlg = "sidecars-configmap-name"
enableNetPolFlg = "enable-netpol"
enablePodAntiaffinityFlg = "enable-pod-antiaffinity"
patroniRetryTimeoutFlg = "patroni-retry-timeout"
enableStandbyLeaderSelectorFlg = "enable-standby-leader-selector"
ControlPlaneNamespaceFlg = "control-plane-namespace"
enableLegacyStandbySelectorFlg = "enable-legacy-standby-selector"
deployEtcdFlg = "deploy-etcd"
etcdImageFlg = "etcd-image"
etcdBackupSidecarImageFlg = "etcd-backup-sidecar-image"
etcdBackupSecretNameFlg = "etcd-backup-secret-name" // nolint
etcdPSPNameFlg = "etcd-psp-name"
replicationChangeRequeueTimeFlg = "replication-change-requeue-time-in-seconds"
postgresletFullnameFlg = "postgreslet-fullname"
enableLBSourceRangesFlg = "enable-lb-source-ranges"
enableRandomStorageEncryptionSecretFlg = "enable-random-storage-encryption-secret"
enableWalGEncryptionFlg = "enable-walg-encryption"
enableForceSharedIPFlg = "enable-force-shared-ip"
initDBJobCMNameFlg = "initdb-job-configmap-name"
enableBootstrapStandbyFromS3Flg = "enable-bootsrtap-standby-from-s3"
enableSuperUserForDBOFlg = "enable-superuser-for-dbo"
tlsClusterIssuerFlg = "tls-cluster-issuer"
tlsSubDomainFlg = "tls-sub-domain"
enablePatroniFailsafeModeFlg = "enable-patroni-failsafe-mode"
enableFsGroupChangePolicyWebhookFlg = "enable-fsgroup-change-policy-webhook"
enableWalGExporterFlg = "enable-walg-exporter"
walGExporterImageFlg = "walg-exporter-image"
walGExporterCPULimitFlg = "walg-exporter-cpu-limit"
walGExporterMemoryLimitFlg = "walg-exporter-memory-limit"
metricsAddrSvcMgrFlg = "metrics-addr-svc-mgr"
metricsAddrCtrlMgrFlg = "metrics-addr-ctrl-mgr"
enableLeaderElectionFlg = "enable-leader-election"
partitionIDFlg = "partition-id"
tenantFlg = "tenant"
ctrlPlaneKubeConfifgFlg = "controlplane-kubeconfig"
loadBalancerIPFlg = "load-balancer-ip"
portRangeStartFlg = "port-range-start"
portRangeSizeFlg = "port-range-size"
customPSPNameFlg = "custom-psp-name"
storageClassFlg = "storage-class"
postgresImageFlg = "postgres-image"
etcdHostFlg = "etcd-host"
crdRegistrationFlg = "enable-crd-registration"
operatorImageFlg = "operator-image"
pgParamBlockListFlg = "postgres-param-blocklist" // nolint
majorVersionUpgradeModeFlg = "major-version-upgrade-mode"
standbyClustersSourceRangesFlg = "standby-clusters-source-ranges"
postgresletNamespaceFlg = "postgreslet-namespace"
sidecarsCMNameFlg = "sidecars-configmap-name"
enableNetPolFlg = "enable-netpol"
enablePodAntiaffinityFlg = "enable-pod-antiaffinity"
patroniRetryTimeoutFlg = "patroni-retry-timeout"
enableStandbyLeaderSelectorFlg = "enable-standby-leader-selector"
ControlPlaneNamespaceFlg = "control-plane-namespace"
enableLegacyStandbySelectorFlg = "enable-legacy-standby-selector"
deployEtcdFlg = "deploy-etcd"
etcdImageFlg = "etcd-image"
etcdBackupSidecarImageFlg = "etcd-backup-sidecar-image"
etcdBackupSecretNameFlg = "etcd-backup-secret-name" // nolint
etcdPSPNameFlg = "etcd-psp-name"
replicationChangeRequeueTimeFlg = "replication-change-requeue-time-in-seconds"
postgresletFullnameFlg = "postgreslet-fullname"
enableLBSourceRangesFlg = "enable-lb-source-ranges"
enableRandomStorageEncryptionSecretFlg = "enable-random-storage-encryption-secret"
enableWalGEncryptionFlg = "enable-walg-encryption"
enableForceSharedIPFlg = "enable-force-shared-ip"
initDBJobCMNameFlg = "initdb-job-configmap-name"
enableBootstrapStandbyFromS3Flg = "enable-bootsrtap-standby-from-s3"
enableSuperUserForDBOFlg = "enable-superuser-for-dbo"
tlsClusterIssuerFlg = "tls-cluster-issuer"
tlsSubDomainFlg = "tls-sub-domain"
enablePatroniFailsafeModeFlg = "enable-patroni-failsafe-mode"
enableFsGroupChangePolicyWebhookFlg = "enable-fsgroup-change-policy-webhook"
enableWalGExporterFlg = "enable-walg-exporter"
walGExporterImageFlg = "walg-exporter-image"
walGExporterCPULimitFlg = "walg-exporter-cpu-limit"
walGExporterMemoryLimitFlg = "walg-exporter-memory-limit"
podAntiaffinityPreferredDuringSchedulingFlg = "pod-antiaffinity-preferred-during-scheduling"
podAntiaffinityTopologyKeyFlg = "pod-antiaffinity-topology-key"
)

var (
Expand All @@ -117,49 +119,51 @@ func init() {
func main() {

var (
metricsAddrCtrlMgr string
metricsAddrSvcMgr string
partitionID string
tenant string
ctrlClusterKubeconfig string
pspName string
lbIP string
storageClass string
postgresImage string
etcdHost string
operatorImage string
majorVersionUpgradeMode string
postgresletNamespace string
sidecarsCMName string
controlPlaneNamespace string
etcdImage string
etcdBackupSidecarImage string
etcdBackupSecretName string
etcdPSPName string
postgresletFullname string
initDBJobCMName string
tlsClusterIssuer string
tlsSubDomain string
walGExporterImage string
walGExporterCPULimit string
walGExporterMemoryLimit string

enableLeaderElection bool
enableCRDRegistration bool
enableNetPol bool
enablePodAntiaffinity bool
enableStandbyLeaderSelector bool
enableLegacyStandbySelector bool
deployEtcd bool
enableLBSourceRanges bool
enableRandomStorageEncryptionSecret bool
enableWalGEncryption bool
enableForceSharedIP bool
enableBootstrapStandbyFromS3 bool
enableSuperUserForDBO bool
enablePatroniFailsafeMode bool
enableFsGroupChangePolicyWebhook bool
enableWalGExporter bool
metricsAddrCtrlMgr string
metricsAddrSvcMgr string
partitionID string
tenant string
ctrlClusterKubeconfig string
pspName string
lbIP string
storageClass string
postgresImage string
etcdHost string
operatorImage string
majorVersionUpgradeMode string
postgresletNamespace string
sidecarsCMName string
controlPlaneNamespace string
etcdImage string
etcdBackupSidecarImage string
etcdBackupSecretName string
etcdPSPName string
postgresletFullname string
initDBJobCMName string
tlsClusterIssuer string
tlsSubDomain string
walGExporterImage string
walGExporterCPULimit string
walGExporterMemoryLimit string
podAntiaffinityTopologyKey string

enableLeaderElection bool
enableCRDRegistration bool
enableNetPol bool
enablePodAntiaffinity bool
enableStandbyLeaderSelector bool
enableLegacyStandbySelector bool
deployEtcd bool
enableLBSourceRanges bool
enableRandomStorageEncryptionSecret bool
enableWalGEncryption bool
enableForceSharedIP bool
enableBootstrapStandbyFromS3 bool
enableSuperUserForDBO bool
enablePatroniFailsafeMode bool
enableFsGroupChangePolicyWebhook bool
enableWalGExporter bool
podAntiaffinityPreferredDuringScheduling bool

portRangeStart int32
portRangeSize int32
Expand Down Expand Up @@ -261,6 +265,11 @@ func main() {
viper.SetDefault(enablePodAntiaffinityFlg, false)
enablePodAntiaffinity = viper.GetBool(enablePodAntiaffinityFlg)

viper.SetDefault(podAntiaffinityPreferredDuringSchedulingFlg, false)
podAntiaffinityPreferredDuringScheduling = viper.GetBool(podAntiaffinityPreferredDuringSchedulingFlg)

podAntiaffinityTopologyKey = viper.GetString(podAntiaffinityTopologyKeyFlg)

// hard coded value
patroniLoopWait = databasev1.DefaultPatroniParamValueLoopWait

Expand Down Expand Up @@ -369,6 +378,8 @@ func main() {
sidecarsCMNameFlg, sidecarsCMName,
enableNetPolFlg, enableNetPol,
enablePodAntiaffinityFlg, enablePodAntiaffinity,
podAntiaffinityPreferredDuringSchedulingFlg, podAntiaffinityPreferredDuringScheduling,
podAntiaffinityTopologyKeyFlg, podAntiaffinityTopologyKey,
patroniRetryTimeoutFlg, patroniRetryTimeout,
enableStandbyLeaderSelectorFlg, enableStandbyLeaderSelector,
ControlPlaneNamespaceFlg, controlPlaneNamespace,
Expand Down Expand Up @@ -455,17 +466,19 @@ func main() {
}

var opMgrOpts operatormanager.Options = operatormanager.Options{
PspName: pspName,
OperatorImage: operatorImage,
DockerImage: postgresImage,
EtcdHost: etcdHost,
CRDRegistration: enableCRDRegistration,
MajorVersionUpgradeMode: majorVersionUpgradeMode,
PostgresletNamespace: postgresletNamespace,
SidecarsConfigMapName: sidecarsCMName,
PodAntiaffinity: enablePodAntiaffinity,
PartitionID: partitionID,
PatroniFailsafeMode: enablePatroniFailsafeMode,
PspName: pspName,
OperatorImage: operatorImage,
DockerImage: postgresImage,
EtcdHost: etcdHost,
CRDRegistration: enableCRDRegistration,
MajorVersionUpgradeMode: majorVersionUpgradeMode,
PostgresletNamespace: postgresletNamespace,
SidecarsConfigMapName: sidecarsCMName,
PodAntiaffinity: enablePodAntiaffinity,
PartitionID: partitionID,
PatroniFailsafeMode: enablePatroniFailsafeMode,
PodAntiaffinityPreferredDuringScheduling: podAntiaffinityPreferredDuringScheduling,
PodAntiaffinityTopologyKey: podAntiaffinityTopologyKey,
}
opMgr, err := operatormanager.New(svcClusterConf, "external/svc-postgres-operator.yaml", scheme, ctrl.Log.WithName("OperatorManager"), opMgrOpts)
if err != nil {
Expand Down
28 changes: 17 additions & 11 deletions pkg/operatormanager/operatormanager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,17 +59,19 @@ var operatorPodMatchingLabels = client.MatchingLabels{operatorPodLabelName: oper

// Options
type Options struct {
PspName string
OperatorImage string
DockerImage string
EtcdHost string
CRDRegistration bool
MajorVersionUpgradeMode string
PostgresletNamespace string
SidecarsConfigMapName string
PodAntiaffinity bool
PartitionID string
PatroniFailsafeMode bool
PspName string
OperatorImage string
DockerImage string
EtcdHost string
CRDRegistration bool
MajorVersionUpgradeMode string
PostgresletNamespace string
SidecarsConfigMapName string
PodAntiaffinity bool
PartitionID string
PatroniFailsafeMode bool
PodAntiaffinityPreferredDuringScheduling bool
PodAntiaffinityTopologyKey string
}

// OperatorManager manages the operator
Expand Down Expand Up @@ -435,6 +437,10 @@ func (m *OperatorManager) editConfigMap(cm *corev1.ConfigMap, namespace string,
cm.Data["replication_username"] = pg.PostgresConfigReplicationUsername

cm.Data["enable_pod_antiaffinity"] = strconv.FormatBool(options.PodAntiaffinity)
cm.Data["pod_antiaffinity_preferred_during_scheduling"] = strconv.FormatBool(options.PodAntiaffinityPreferredDuringScheduling)
if options.PodAntiaffinityTopologyKey != "" {
cm.Data["pod_antiaffinity_topology_key"] = options.PodAntiaffinityTopologyKey
}

cm.Data["secret_name_template"] = "{username}.{cluster}.credentials"
cm.Data["master_dns_name_format"] = "{cluster}.{team}.{hostedzone}"
Expand Down