admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update & clean debug log

Browse Source 
Signed-off-by: soulseen <sunzhu@yunify.com>
This commit is contained in:
soulseen
2019-08-24 14:54:23 +08:00
parent 8aadf7af34
commit 959791ead5
8 changed files with 122 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
pkg/models/registries/manifest.go
View File

@@ -6,17 +6,19 @@ import (
"net/http"
"github.com/docker/distribution/manifest/schema2"
log "github.com/golang/glog"
"github.com/emicklei/go-restful"
log "k8s.io/klog"
)
var statusUnauthorized = "Not found or unauthorized"
// Digest returns the digest for an image.
func (r *Registry) ImageManifest(image Image, token string) (*ImageManifest, error, int) {
func (r *Registry) ImageManifest(image Image, token string) (*ImageManifest, error) {
url := r.GetDigestUrl(image)
log.Info("registry.manifests.get url=" + url)
req, err := http.NewRequest("GET", url, nil)
if err != nil {
return nil, err, http.StatusInternalServerError
return nil, err
}
req.Header.Add("Accept", schema2.MediaTypeManifest)
@@ -26,21 +28,25 @@ func (r *Registry) ImageManifest(image Image, token string) (*ImageManifest, err
resp, err := r.Client.Do(req)
if err != nil {
return nil, err, http.StatusInternalServerError
return nil, err
}
defer resp.Body.Close()
respBody, _ := GetRespBody(resp)
if resp.StatusCode != http.StatusOK && resp.StatusCode != http.StatusNotFound {
log.Info("got response: " + string(resp.StatusCode) + string(respBody))
return nil, fmt.Errorf("%s", respBody), resp.StatusCode
if resp.StatusCode != http.StatusOK {
if resp.StatusCode == http.StatusNotFound || resp.StatusCode == http.StatusUnauthorized {
log.Error(statusUnauthorized)
return nil, restful.NewError(resp.StatusCode, statusUnauthorized)
}
log.Error("got response: " + string(resp.StatusCode) + string(respBody))
return nil, restful.NewError(resp.StatusCode, "got image manifest failed")
}
imageManifest := &ImageManifest{}
json.Unmarshal(respBody, imageManifest)
err = json.Unmarshal(respBody, imageManifest)
return imageManifest, nil, http.StatusOK
return imageManifest, err
}
func (r *Registry) GetDigestUrl(image Image) string {