unistack-org/micro
4
0
Fork 3
Code Issues 19 Pull Requests 1 Actions Packages Projects Releases 259 Wiki Activity

log error and ensure we pass through namespace

Browse Source
This commit is contained in:
Asim Aslam 2020-04-23 17:14:30 +01:00
parent 2299559397
commit ec929b3d2f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/kubernetes/kubernetes.go
View File

@ -461,7 +461,7 @@ func (k *kubernetes) Read(opts ...runtime.ReadOption) ([]*runtime.Service, error
labels["micro"] = options.Type labels["micro"] = options.Type
} }
srvs, err := k.getService(labels) srvs, err := k.getService(labels, client.GetNamespace(options.Namespace))
if err != nil { if err != nil {
return nil, err return nil, err
} }

6
util/kubernetes/api/response.go
View File

@ -3,6 +3,7 @@ package api
import ( import (
"encoding/json" "encoding/json"
"errors" "errors"
"fmt"
"io/ioutil" "io/ioutil"
"net/http" "net/http"
) )
@ -50,9 +51,8 @@ func (r *Response) Into(data interface{}) error {
defer r.res.Body.Close() defer r.res.Body.Close()
decoder := json.NewDecoder(r.res.Body) decoder := json.NewDecoder(r.res.Body)
err := decoder.Decode(&data) if err := decoder.Decode(&data); err != nil {
if err != nil { return fmt.Errorf("%v: %v", ErrDecode, err)
return ErrDecode
} }
return r.err return r.err