Skip to content

K8SPSMDB-1503: include horizon domains in certificates #2157

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
hors merged 11 commits into from
Jan 5, 2026
Merged

K8SPSMDB-1503: include horizon domains in certificates #2157

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
73d5aa1
K8SPSMDB-1503: include horizon domains in certificates
pooknull Dec 19, 2025
24c6098
fix `GetHorizons` method
pooknull Dec 22, 2025
b2ba61c
add unit-test
pooknull Dec 23, 2025
a322f9a
add get certificate sans unit-test
pooknull Dec 23, 2025
f6f7d55
prepare split-horizon e2e test
pooknull Dec 23, 2025
a5a7a21
update split-horizon test
pooknull Dec 23, 2025
45e1e78
Merge branch 'main' into K8SPSMDB-1503
pooknull Dec 23, 2025
c3f04e8
deduplicate
pooknull Dec 23, 2025
de7a239
address copilot comments
pooknull Dec 24, 2025
d63d7c4
Merge branch 'main' into K8SPSMDB-1503
pooknull Dec 24, 2025
a7f4077
Merge branch 'main' into K8SPSMDB-1503
hors Jan 5, 2026
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
27 changes: 27 additions & 0 deletions pkg/apis/psmdb/v1/psmdb_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -751,6 +751,33 @@ type ReplsetSpec struct {
PrimaryPreferTagSelector PrimaryPreferTagSelectorSpec `json:"primaryPreferTagSelector,omitempty"`
}

func (r *ReplsetSpec) GetHorizons(withPorts bool) map[string]string {
horizons := make(map[string]string)
for podName, m := range r.Horizons {
overrides, ok := r.ReplsetOverrides[podName]
hasOverrides := ok && len(overrides.Horizons) > 0

for h, domain := range m {
if hasOverrides {
d, ok := overrides.Horizons[h]
if ok {
domain = d
}
}

idx := strings.IndexRune(domain, ':')
if withPorts && idx == -1 {
domain = fmt.Sprintf("%s:%d", domain, r.GetPort())
}
if !withPorts && idx != -1 {
domain = domain[:idx]
}
horizons[h] = domain
}
}
Copy link

Copilot AI Dec 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The GetHorizons method only iterates over base Horizons (line 769) and applies overrides to them. This means if a pod has horizons defined exclusively in ReplsetOverrides but not in the base Horizons map, those override-only horizons will be ignored. Consider also iterating over ReplsetOverrides to ensure all horizon configurations are included, even if they don't have a corresponding entry in the base Horizons map.

Suggested change
}
}
for podName, overrides := range r.ReplsetOverrides {
if len(overrides.Horizons) == 0 {
continue
}
// Skip pods that already have horizons from the base spec.
if _, exists := horizons[podName]; exists {
continue
}
horizons[podName] = make(map[string]string, len(overrides.Horizons))
for h, domain := range overrides.Horizons {
if withPorts {
if !strings.Contains(domain, ":") {
domain = fmt.Sprintf("%s:%d", domain, r.GetPort())
}
}
horizons[podName][h] = domain
}
}

Copilot uses AI. Check for mistakes.
return horizons
}

func (r *ReplsetSpec) PodName(cr *PerconaServerMongoDB, idx int) string {
return fmt.Sprintf("%s-%s-%d", cr.Name, r.Name, idx)
}
Expand Down
18 changes: 2 additions & 16 deletions pkg/controller/perconaservermongodb/mgo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,23 +273,9 @@ func (r *ReconcilePerconaServerMongoDB) getConfigMemberForPod(ctx context.Contex
member.Priority = *overrides.Priority
}

horizons := make(map[string]string)
for h, domain := range rs.Horizons[pod.Name] {
d := domain
if !strings.Contains(d, ":") {
d = fmt.Sprintf("%s:%d", d, rs.GetPort())
}
horizons[h] = d
}
for h, domain := range overrides.Horizons {
d := domain
if !strings.Contains(d, ":") {
d = fmt.Sprintf("%s:%d", d, rs.GetPort())
}
horizons[h] = d
}
horizons := rs.GetHorizons(true)
if len(horizons) > 0 {
member.Horizons = horizons
member.Horizons = rs.GetHorizons(true)
}

tags := util.MapMerge(mongo.ReplsetTags{
Expand Down
11 changes: 7 additions & 4 deletions pkg/psmdb/tls/tls.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,11 +207,14 @@ func GetCertificateSans(cr *api.PerconaServerMongoDB) []string {
cr.Name + "-" + replset.Name + "." + cr.Namespace + "." + cr.Spec.MultiCluster.DNSSuffix,
"*." + cr.Name + "-" + replset.Name + "." + cr.Namespace + "." + cr.Spec.MultiCluster.DNSSuffix,
}...)
}
if cr.CompareVersion("1.13.0") >= 0 {
sans = append(sans, "*."+cr.Namespace+"."+cr.Spec.MultiCluster.DNSSuffix)
}

if cr.CompareVersion("1.22.0") >= 0 && len(replset.Horizons) > 0 {
for _, domain := range replset.GetHorizons(false) {
sans = append(sans, domain)
}
}
}
sans = append(sans, "*."+cr.Namespace+"."+cr.Spec.MultiCluster.DNSSuffix)
sans = append(sans, getShardingSans(cr)...)

return sans
Expand Down
Loading