@@ -125,20 +125,20 @@ func getYataiHelmRelease(ctx context.Context, cluster *models.Cluster) (release_
125
125
}
126
126
127
127
func getYataiEndpoint (ctx context.Context , cluster * models.Cluster , inCluster bool ) (endpoint string , err error ) {
128
+ svcName := "yatai"
129
+ namespace := "yatai-system"
128
130
release_ , err := getYataiHelmRelease (ctx , cluster )
129
131
if err != nil {
130
132
err = errors .Wrapf (err , "get yatai helm release" )
131
133
return
132
134
}
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
+ }
142
142
}
143
143
144
144
cliset , _ , err := ClusterService .GetKubeCliSet (ctx , cluster )
@@ -164,10 +164,10 @@ func getYataiEndpoint(ctx context.Context, cluster *models.Cluster, inCluster bo
164
164
}
165
165
}
166
166
167
- svcCli := cliset .CoreV1 ().Services (release_ . Namespace )
167
+ svcCli := cliset .CoreV1 ().Services (namespace )
168
168
svc , err := svcCli .Get (ctx , svcName , metav1.GetOptions {})
169
169
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 )
171
171
return
172
172
}
173
173
for _ , port := range svc .Spec .Ports {
0 commit comments