Skip to content

Commit bc42856

Browse files
committed
fix: default yatai endpoint
1 parent 9f88187 commit bc42856

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

api-server/services/yatai_component.go

+11-11
Original file line numberDiff line numberDiff line change
@@ -125,20 +125,20 @@ func getYataiHelmRelease(ctx context.Context, cluster *models.Cluster) (release_
125125
}
126126

127127
func getYataiEndpoint(ctx context.Context, cluster *models.Cluster, inCluster bool) (endpoint string, err error) {
128+
svcName := "yatai"
129+
namespace := "yatai-system"
128130
release_, err := getYataiHelmRelease(ctx, cluster)
129131
if err != nil {
130132
err = errors.Wrapf(err, "get yatai helm release")
131133
return
132134
}
133-
if release_ == nil {
134-
endpoint = fmt.Sprintf("http://localhost:%d", config.YataiConfig.Server.Port)
135-
return
136-
}
137-
var svcName string
138-
if strings.Contains(release_.Name, "yatai") {
139-
svcName = release_.Name
140-
} else {
141-
svcName = fmt.Sprintf("%s-yatai", release_.Name)
135+
if release_ != nil {
136+
namespace = release_.Namespace
137+
if strings.Contains(release_.Name, "yatai") {
138+
svcName = release_.Name
139+
} else {
140+
svcName = fmt.Sprintf("%s-yatai", release_.Name)
141+
}
142142
}
143143

144144
cliset, _, err := ClusterService.GetKubeCliSet(ctx, cluster)
@@ -164,10 +164,10 @@ func getYataiEndpoint(ctx context.Context, cluster *models.Cluster, inCluster bo
164164
}
165165
}
166166

167-
svcCli := cliset.CoreV1().Services(release_.Namespace)
167+
svcCli := cliset.CoreV1().Services(namespace)
168168
svc, err := svcCli.Get(ctx, svcName, metav1.GetOptions{})
169169
if err != nil {
170-
err = errors.Wrapf(err, "get service %s", svcName)
170+
err = errors.Wrapf(err, "get service %s from namespace %s", svcName, namespace)
171171
return
172172
}
173173
for _, port := range svc.Spec.Ports {

0 commit comments

Comments
 (0)