Skip to content

Fix: Use CLUSTER_DOMAIN environment variable instead of hardcoded cluster.local #479

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

Closed
wants to merge 1 commit into from
Closed

Fix: Use CLUSTER_DOMAIN environment variable instead of hardcoded cluster.local #479

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
6 changes: 6 additions & 0 deletions changelog/20250925_fix_use_cluster_domain_environment_variable_instead_of.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
kind: fix
date: 2025-09-25
---

* Use CLUSTER_DOMAIN environment variable instead of the fixed value `cluster.local`
4 changes: 3 additions & 1 deletion controllers/searchcontroller/community_search_source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"strings"

"github.com/blang/semver"
"github.com/mongodb/mongodb-kubernetes/pkg/util/env"
"golang.org/x/xerrors"
"k8s.io/apimachinery/pkg/types"

Expand All @@ -26,8 +27,9 @@ type CommunitySearchSource struct {

func (r *CommunitySearchSource) HostSeeds() []string {
seeds := make([]string, r.Spec.Members)
clusterDomain := env.ReadOrDefault("CLUSTER_DOMAIN", "cluster.local")
for i := range seeds {
seeds[i] = fmt.Sprintf("%s-%d.%s.%s.svc.cluster.local:%d", r.Name, i, r.ServiceName(), r.Namespace, r.GetMongodConfiguration().GetDBPort())
seeds[i] = fmt.Sprintf("%s-%d.%s.%s.svc.%s:%d", r.Name, i, r.ServiceName(), r.Namespace, clusterDomain, r.GetMongodConfiguration().GetDBPort())
}
return seeds
}
Expand Down
4 changes: 3 additions & 1 deletion controllers/searchcontroller/enterprise_search_source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"strings"

"github.com/blang/semver"
"github.com/mongodb/mongodb-kubernetes/pkg/util/env"
"golang.org/x/xerrors"
"k8s.io/apimachinery/pkg/types"

Expand All @@ -24,8 +25,9 @@ func NewEnterpriseResourceSearchSource(mdb *mdbv1.MongoDB) SearchSourceDBResourc

func (r EnterpriseResourceSearchSource) HostSeeds() []string {
seeds := make([]string, r.Spec.Members)
clusterDomain := env.ReadOrDefault("CLUSTER_DOMAIN", "cluster.local")
for i := range seeds {
seeds[i] = fmt.Sprintf("%s-%d.%s.%s.svc.cluster.local:%d", r.Name, i, r.ServiceName(), r.Namespace, r.Spec.GetAdditionalMongodConfig().GetPortOrDefault())
seeds[i] = fmt.Sprintf("%s-%d.%s.%s.svc.%s:%d", r.Name, i, r.ServiceName(), r.Namespace, clusterDomain, r.Spec.GetAdditionalMongodConfig().GetPortOrDefault())
}
return seeds
}
Expand Down
4 changes: 3 additions & 1 deletion controllers/searchcontroller/mongodbsearch_reconcile_helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (

"github.com/blang/semver"
"github.com/ghodss/yaml"
"github.com/mongodb/mongodb-kubernetes/pkg/util/env"
"go.uber.org/zap"
"golang.org/x/xerrors"
"k8s.io/apimachinery/pkg/fields"
Expand Down Expand Up @@ -405,7 +406,8 @@ func GetMongodConfigParameters(search *searchv1.MongoDBSearch) map[string]any {

func mongotHostAndPort(search *searchv1.MongoDBSearch) string {
svcName := search.SearchServiceNamespacedName()
return fmt.Sprintf("%s.%s.svc.cluster.local:%d", svcName.Name, svcName.Namespace, search.GetMongotPort())
clusterDomain := env.ReadOrDefault("CLUSTER_DOMAIN", "cluster.local")
return fmt.Sprintf("%s.%s.svc.%s:%d", svcName.Name, svcName.Namespace, clusterDomain, search.GetMongotPort())
}

func (r *MongoDBSearchReconcileHelper) ValidateSingleMongoDBSearchForSearchSource(ctx context.Context) error {
Expand Down