Skip to content

Commit 6f32578

Browse files
authored
Merge pull request #152 from gianlucam76/cluster-domain
(bug) dynamic Kubernetes cluster domain for MCP server URL
2 parents 86f534f + 690cb7c commit 6f32578

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

internal/server/http.go

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121
"errors"
2222
"fmt"
2323
"net/http"
24+
"os"
2425
"reflect"
2526
"sort"
2627
"strconv"
@@ -45,7 +46,6 @@ import (
4546

4647
const (
4748
maxItems = 6
48-
mcpServer = "http://mcp-server.projectsveltos.svc.cluster.local"
4949
namespaceRequiredError = "namespace is required"
5050
clusterNameRequiredError = "cluster name is required"
5151
)
@@ -54,6 +54,14 @@ type Token struct {
5454
Value string `json:"token,omitempty"`
5555
}
5656

57+
func getMCPServerURL() string {
58+
domain := os.Getenv("KUBERNETES_CLUSTER_DOMAIN")
59+
if domain == "" {
60+
domain = "cluster.local"
61+
}
62+
return fmt.Sprintf("http://mcp-server.projectsveltos.svc.%s", domain)
63+
}
64+
5765
var (
5866
ginLogger logr.Logger
5967

@@ -642,7 +650,7 @@ var (
642650
return
643651
}
644652

645-
result, err := mcpclient.CheckInstallation(c.Request.Context(), mcpServer, ginLogger)
653+
result, err := mcpclient.CheckInstallation(c.Request.Context(), getMCPServerURL(), ginLogger)
646654
if err != nil {
647655
ginLogger.V(logs.LogInfo).Info(fmt.Sprintf("failed to check installation status: %v", err))
648656
_ = c.AbortWithError(http.StatusInternalServerError, err)
@@ -754,7 +762,7 @@ var (
754762
Name: clusterName,
755763
}
756764

757-
result, err := mcpclient.CheckProfileDeploymentOnCluster(c.Request.Context(), mcpServer,
765+
result, err := mcpclient.CheckProfileDeploymentOnCluster(c.Request.Context(), getMCPServerURL(),
758766
clusterRef, profileRef, ginLogger)
759767
if err != nil {
760768
ginLogger.V(logs.LogInfo).Info(fmt.Sprintf("failed to check profile deployment status: %v", err))
@@ -804,7 +812,7 @@ var (
804812
Name: name,
805813
}
806814

807-
result, err := mcpclient.CheckClusterDeploymentStatuses(c.Request.Context(), mcpServer,
815+
result, err := mcpclient.CheckClusterDeploymentStatuses(c.Request.Context(), getMCPServerURL(),
808816
clusterRef, ginLogger)
809817
if err != nil {
810818
ginLogger.V(logs.LogInfo).Info(fmt.Sprintf("failed to check profile deployment errors: %v", err))
@@ -856,7 +864,7 @@ var (
856864
Name: name,
857865
}
858866

859-
result, err := mcpclient.AnalyzeEventPipeline(c.Request.Context(), mcpServer,
867+
result, err := mcpclient.AnalyzeEventPipeline(c.Request.Context(), getMCPServerURL(),
860868
clusterRef, eventTriggerName, ginLogger)
861869
if err != nil {
862870
ginLogger.V(logs.LogInfo).Info(fmt.Sprintf("failed to check profile deployment errors: %v", err))

0 commit comments

Comments
 (0)